@parall/agent-core 1.25.0 → 1.26.1

package/src/skills/parall-tasks.ts

@@ -0,0 +1,65 @@
+export const PARALL_TASKS_SKILL = `# Parall Tasks
+
+Manage tasks and projects via the Parall CLI. Auth and runtime context are pre-configured.
+
+## Task Commands
+
+\`\`\`bash
+# List tasks (filterable by status)
+parall tasks list
+parall tasks list --status todo
+parall tasks list --status in_progress
+
+# Create a task
+parall tasks create --title "Task title" [--assignee-id prll://usr_xxx] [--project-id prll://prj_xxx]
+
+# Update task status
+parall tasks update prll://tsk_xxx --status in_progress
+parall tasks update prll://tsk_xxx --status done
+
+# Add a comment
+parall tasks comments add prll://tsk_xxx --body "Progress update..."
+\`\`\`
+
+## Project Commands
+
+\`\`\`bash
+parall projects list
+\`\`\`
+
+## Watching Tasks
+
+Subscribe to a task to receive notifications when others comment on it.
+
+\`\`\`bash
+# Watch a task (you'll receive dispatch events for new comments)
+parall tasks watch prll://tsk_xxx
+
+# Unwatch
+parall tasks unwatch prll://tsk_xxx
+
+# List who is watching
+parall tasks watchers prll://tsk_xxx
+\`\`\`
+
+Note: task creators are automatically watching their tasks.
+
+## Responding to Task Assignments
+
+When you receive \`[Event: task.assigned]\`:
+
+1. Acknowledge with a comment: \`tasks comments add prll://tsk_xxx --body "On it"\`
+2. Update status: \`tasks update prll://tsk_xxx --status in_progress\`
+3. Do the work
+4. Report results via comment and update status to \`done\`
+
+## Responding to Task Comments
+
+When you receive \`[Event: task.comment.created]\`, someone commented on a task you are watching. Read the comment body and respond if action is needed:
+
+1. Review the comment content and task context
+2. Reply via comment: \`tasks comments add prll://tsk_xxx --body "Response..."\`
+3. If the comment requests status changes, update accordingly
+
+All CLI output is JSON.
+`;

package/src/skills/parall-wiki.ts

@@ -0,0 +1,131 @@
+export const PARALL_WIKI_SKILL = `# Parall Wiki
+
+Manage organization wikis via the Parall CLI. Auth is pre-configured.
+
+## Browsing (no local state needed)
+
+\`\`\`bash
+parall wiki list                       # List all wikis
+parall wiki tree <slug>                 # List files and directories
+parall wiki tree <slug> --path docs/    # List a subdirectory
+\`\`\`
+
+## Editing
+
+Wiki editing works on a **local workspace** — a directory on disk where wiki
+files are synced. You sync from the server, edit files locally, then propose
+a changeset.
+
+### Step 1: Sync
+
+\`\`\`bash
+parall wiki sync <slug>
+\`\`\`
+
+This downloads wiki files to a local directory. The output includes the
+**absolute mount path** for each wiki (e.g. \`synced → /path/to/workspace/kb\`).
+
+### Step 2: Find the mount path
+
+The sync output JSON contains \`synced[].path\` — the absolute path where files
+live. You can also check it anytime with:
+
+\`\`\`bash
+parall wiki status <slug>
+\`\`\`
+
+The output includes \`Mount: /absolute/path/to/<slug>\`.
+
+Use this path with \`read\`, \`write\`, and \`edit\` tools. For example, if the mount
+is \`/data/.openclaw/workspace/kb\`, then \`README.md\` is at
+\`/data/.openclaw/workspace/kb/README.md\`.
+
+### Step 3: Edit files
+
+Use standard file tools (\`read\`, \`write\`, \`edit\`) on files under the mount path.
+
+### Step 4: Review changes
+
+\`\`\`bash
+parall wiki diff <slug>       # Shows unified diff of all local changes
+parall wiki status <slug>     # Shows which files changed with +/- line counts
+\`\`\`
+
+Always review before proposing.
+
+### Step 5: Propose changeset
+
+\`\`\`bash
+parall wiki changeset create <slug> --title "Description of changes"
+\`\`\`
+
+This uploads your local changes. Unprotected paths auto-merge immediately; the
+CLI prints \`auto_merged: true\` and refreshes the local manifest. Protected
+paths remain as a changeset for review; follow the returned \`next_action\`.
+
+## Changeset Management
+
+\`\`\`bash
+parall wiki changeset list <slug>               # List all changesets
+parall wiki changeset show <changesetId> <slug> # Show detail + feedback
+parall wiki changeset diff <changesetId> <slug> # Show changeset diff
+\`\`\`
+
+If a changeset is rejected, fix the files locally and re-propose:
+
+\`\`\`bash
+parall wiki changeset create <slug> --update <changesetId>
+\`\`\`
+
+The title is inherited from the original changeset — no need to repeat it.
+
+## Handling sync conflicts
+
+\`wiki sync\` runs a three-way merge. When both you and the server changed the
+same file, sync **does not overwrite your work**. It leaves your file intact
+and drops the upstream version under \`.parall-wiki/conflicts/\`:
+
+| Marker | Meaning |
+|--------|---------|
+| \`.parall-wiki/conflicts/<path>.remote\` | Server has different content (concurrent edit, new file collision, or server changed a file you deleted) |
+| \`.parall-wiki/conflicts/<path>.remote-deleted\` | Server deleted the file; you still have edits |
+
+stderr prints one line per conflict. Recovery:
+
+**Accept upstream** (drop your edit):
+\`\`\`bash
+cp .parall-wiki/conflicts/<path>.remote <path>
+parall wiki sync
+\`\`\`
+
+**Keep yours** (or hand-merge, then propose):
+\`\`\`bash
+# edit <path> to final content
+parall wiki diff <slug>
+parall wiki changeset create <slug> --title "Reconcile <path>"
+parall wiki sync   # fast-forwards after server merges
+\`\`\`
+
+**Accept server delete** (\`.remote-deleted\` only):
+\`\`\`bash
+rm <path>
+parall wiki sync
+\`\`\`
+
+Sync failures (\`download\`, \`shape-conflict\`) set exit code 1 and retry on
+next sync. Conflicts exit 0 — they need your decision, not a retry.
+
+## Discarding local changes
+
+\`\`\`bash
+parall wiki reset <slug>      # Restore all files to last synced state
+\`\`\`
+
+## History
+
+\`\`\`bash
+parall wiki log <slug>        # Recent wiki operations
+\`\`\`
+
+All CLI output is JSON. Run \`parall wiki --help\` for full options.
+`;

package/src/types.ts

@@ -12,6 +12,8 @@ export type DispatchState = {
   activeForks: Map<string, string>;
   pendingForkResults: ForkResult[];
   mainBuffer: ParallEvent[];
+  /** Snapshot of the session branch point taken BEFORE runDispatch starts on main. */
+  mainPreDispatchBranchPoint?: string;
 };
 
 /** Normalized inbound event from Parall. */