taskplane 0.1.11 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taskplane",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "AI agent orchestration for pi — parallel task execution with checkpoint discipline",
   "keywords": [
     "pi-package",

package/templates/agents/task-merger.md

@@ -73,8 +73,8 @@ Use the source branch and merge message from the merge request.
 Run each verification command from the merge request. Typical commands:
 
 ```bash
-go build ./...                     # All services compile
-cd web && npm run type-check       # Frontend types valid
+npm test                           # Unit/integration checks
+npm run build                      # Build/compile checks
 ```
 
 **If verification passes:** Write result with `status: "SUCCESS"` (or
@@ -95,29 +95,29 @@ Write a `BUILD_FAILURE` result with the error output from the failed command.
 | Different files modified | N/A (git handles automatically) | No action needed |
 | Same file, different sections | Yes — accept both changes | Edit file to include both changes, remove conflict markers |
 | Same file, same lines | **No** — needs human review | Abort merge immediately |
-| Generated files (`go.sum`, `package-lock.json`) | Yes — regenerate | Run `go mod tidy` / `npm install` to regenerate |
-| `STATUS.md` / `.DONE` files | Yes — keep both | Accept the incoming (theirs) version for STATUS.md; keep both .DONE files |
-| `CONTEXT.md` (append-only sections) | Yes — keep both additions | Merge both additions into the relevant sections |
+| Generated files (`package-lock.json`, `pnpm-lock.yaml`, `yarn.lock`) | Yes — regenerate | Run package manager install command to regenerate |
+| `STATUS.md` / `.DONE` files | Yes — keep both | Accept incoming STATUS.md; keep `.DONE` markers |
+| `CONTEXT.md` (append-only sections) | Yes — keep both additions | Merge both additions into relevant sections |
 
 ### Auto-Resolution Rules
 
 1. **Same file, different sections:** Open the file, identify conflict markers
    (`<<<<<<<`, `=======`, `>>>>>>>`). If the conflicting hunks are in clearly
-   different sections (different functions, different list items, different
-   paragraphs), keep both changes. Remove all conflict markers.
+   different sections, keep both changes and remove markers.
 
-2. **Generated files:** Do NOT manually edit. Instead:
-   - `go.sum` → Run `go mod tidy` in the affected module directory
-   - `package-lock.json` → Run `npm install` in the affected package directory
-   - Then `git add` the regenerated file
+2. **Generated files:** Do NOT manually edit. Regenerate lockfiles using your
+   project's package manager command (for example `npm install`,
+   `pnpm install`, or `yarn install`), then `git add` the regenerated file.
 
-3. **STATUS.md:** These are per-task tracking files. Accept theirs (`git checkout --theirs STATUS.md && git add STATUS.md`). Each task has its own STATUS.md so there is no meaningful merge — the incoming version is always more current.
+3. **STATUS.md:** These are per-task tracking files. Accept theirs:
+   ```bash
+   git checkout --theirs STATUS.md && git add STATUS.md
+   ```
 
-4. **`.DONE` marker files:** These are empty sentinel files. If both sides created one, keep it (`git add .DONE`).
+4. **`.DONE` marker files:** Keep marker files if either side created one.
 
 5. **Same lines / ambiguous conflicts:** Do NOT attempt to resolve. Run
-   `git merge --abort` and report `CONFLICT_UNRESOLVED`. The orchestrator will
-   pause the batch for human intervention.
+   `git merge --abort` and report `CONFLICT_UNRESOLVED`.
 
 ---
 
@@ -130,7 +130,7 @@ Write your result as JSON to the path specified in the merge request
 {
   "status": "SUCCESS",
   "source_branch": "task/lane-1-abc123",
-  "target_branch": "develop",
+  "target_branch": "main",
   "merge_commit": "abc1234def5678",
   "conflicts": [],
   "verification": {
@@ -147,42 +147,25 @@ Write your result as JSON to the path specified in the merge request
 |-------|------|-------------|
 | `status` | string | One of: `SUCCESS`, `CONFLICT_RESOLVED`, `CONFLICT_UNRESOLVED`, `BUILD_FAILURE` |
 | `source_branch` | string | The lane branch that was merged (from merge request) |
-| `target_branch` | string | The target branch (from merge request, typically `develop`) |
-| `merge_commit` | string | The merge commit SHA (only present if merge succeeded) |
+| `target_branch` | string | Target branch from merge request (typically integration branch, e.g. `main`) |
+| `merge_commit` | string | Merge commit SHA (present only if merge succeeded) |
 | `conflicts` | array | List of conflict entries (empty if no conflicts) |
-| `conflicts[].file` | string | Path to the conflicted file |
-| `conflicts[].type` | string | Classification: `different-sections`, `same-lines`, `generated`, `status-file` |
-| `conflicts[].resolved` | boolean | Whether the conflict was auto-resolved |
-| `conflicts[].resolution` | string | How it was resolved (e.g., `"kept both changes"`, `"regenerated"`, `"accepted theirs"`) |
+| `conflicts[].file` | string | Path to conflicted file |
+| `conflicts[].type` | string | Classification (`different-sections`, `same-lines`, `generated`, `status-file`) |
+| `conflicts[].resolved` | boolean | Whether conflict was auto-resolved |
+| `conflicts[].resolution` | string | Resolution summary |
 | `verification.ran` | boolean | Whether verification commands were executed |
-| `verification.passed` | boolean | Whether all verification commands passed |
-| `verification.output` | string | Command output (populated only on failure, truncated to 2000 chars) |
+| `verification.passed` | boolean | Whether verification commands passed |
+| `verification.output` | string | Verification output (useful on failures) |
 
 ### Status Definitions
 
 | Status | Meaning | Orchestrator Action |
 |--------|---------|---------------------|
-| `SUCCESS` | Merge completed, no conflicts, verification passed | Continue to next lane |
-| `CONFLICT_RESOLVED` | Conflicts occurred but were auto-resolved, verification passed | Log details, continue |
-| `CONFLICT_UNRESOLVED` | Conflicts that require human intervention | Pause batch, notify user |
-| `BUILD_FAILURE` | Merge succeeded but verification failed (merge was reverted) | Pause batch, notify user |
-
-### Example: Clean Merge
-
-```json
-{
-  "status": "SUCCESS",
-  "source_branch": "task/lane-1-abc123",
-  "target_branch": "develop",
-  "merge_commit": "abc1234def5678",
-  "conflicts": [],
-  "verification": {
-    "ran": true,
-    "passed": true,
-    "output": ""
-  }
-}
-```
+| `SUCCESS` | Merge completed, verification passed | Continue to next lane |
+| `CONFLICT_RESOLVED` | Conflicts auto-resolved, verification passed | Log details, continue |
+| `CONFLICT_UNRESOLVED` | Conflict requires human intervention | Pause batch, notify user |
+| `BUILD_FAILURE` | Merge succeeded but verification failed (merge reverted) | Pause batch, notify user |
 
 ### Example: Conflict Resolved
 
@@ -190,20 +173,20 @@ Write your result as JSON to the path specified in the merge request
 {
   "status": "CONFLICT_RESOLVED",
   "source_branch": "task/lane-2-abc123",
-  "target_branch": "develop",
+  "target_branch": "main",
   "merge_commit": "def4567abc8901",
   "conflicts": [
     {
-      "file": "go.sum",
+      "file": "package-lock.json",
       "type": "generated",
       "resolved": true,
-      "resolution": "regenerated via go mod tidy"
+      "resolution": "regenerated via npm install"
     },
     {
-      "file": "services/time-service/internal/interfaces/http/routes/routes.go",
+      "file": "src/routes/api.ts",
       "type": "different-sections",
       "resolved": true,
-      "resolution": "kept both changes — different route groups"
+      "resolution": "kept both route additions"
     }
   ],
   "verification": {
@@ -214,43 +197,19 @@ Write your result as JSON to the path specified in the merge request
 }
 ```
 
-### Example: Unresolved Conflict
-
-```json
-{
-  "status": "CONFLICT_UNRESOLVED",
-  "source_branch": "task/lane-3-abc123",
-  "target_branch": "develop",
-  "merge_commit": "",
-  "conflicts": [
-    {
-      "file": "services/identity-service/internal/domain/services/auth_service.go",
-      "type": "same-lines",
-      "resolved": false,
-      "resolution": ""
-    }
-  ],
-  "verification": {
-    "ran": false,
-    "passed": false,
-    "output": ""
-  }
-}
-```
-
 ### Example: Build Failure
 
 ```json
 {
   "status": "BUILD_FAILURE",
   "source_branch": "task/lane-1-abc123",
-  "target_branch": "develop",
+  "target_branch": "main",
   "merge_commit": "",
   "conflicts": [],
   "verification": {
     "ran": true,
     "passed": false,
-    "output": "services/time-service/internal/domain/services/pto_service.go:142:35: undefined: NewAccrualEngine"
+    "output": "src/server.ts:42:17 - error TS2304: Cannot find name 'createApiRouter'"
   }
 }
 ```

package/templates/config/task-orchestrator.yaml

@@ -19,10 +19,10 @@ orchestrator:
   max_lanes: 3
 
   # Where to create worktree directories.
-  # "sibling"       = ../{prefix}-{N}          (e.g. ../taskplane-wt-1)
-  # "subdirectory"  = .worktrees/{prefix}-{N}  (e.g. .worktrees/taskplane-wt-1)
+  # "sibling"       = ../{prefix}-{N}          (e.g. ../project-wt-1)
+  # "subdirectory"  = .worktrees/{prefix}-{N}  (e.g. .worktrees/project-wt-1)
   worktree_location: "subdirectory"
-  worktree_prefix: "taskplane-wt"
+  worktree_prefix: "project-wt"
 
   # Integration branch that lanes merge into.
   integration_branch: "main"

package/templates/config/task-runner.yaml

@@ -10,8 +10,8 @@
 # ── Project ───────────────────────────────────────────────────────────
 
 project:
-  name: "Example Project"
-  description: "Replace with a short description of your project"
+  name: "Your Project"
+  description: "Short description of your project"
 
 paths:
   tasks: "tasks"

package/templates/tasks/EXAMPLE-001-hello-world/PROMPT.md

@@ -21,9 +21,17 @@
 ## Mission
 
 Create a simple `hello-taskplane.md` file in the project root to verify that
-the Taskplane task runner is working correctly. This is a smoke test — if the
-worker can read this prompt, create the file, and mark the task done, the
-installation is healthy.
+Taskplane task execution is working correctly. This is a smoke test — if the
+worker can read this prompt, create the file, checkpoint progress, and mark the
+task done, the installation is healthy.
+
+## Expected File Content
+
+`hello-taskplane.md` should include:
+
+- A title line (for example: `# Hello from Taskplane`)
+- A line containing the task ID: `EXAMPLE-001`
+- A line containing today's date
 
 ## Dependencies
 
@@ -51,12 +59,12 @@ _No additional context needed._
 
 ### Step 1: Create Hello File
 
-- [ ] Create `hello-taskplane.md` in the project root with a friendly message
-- [ ] Include the current date and the task ID (EXAMPLE-001)
+- [ ] Create `hello-taskplane.md` in the project root
+- [ ] Add a title plus lines containing today's date and task ID `EXAMPLE-001`
 
 ### Step 2: Verification
 
-- [ ] Verify `hello-taskplane.md` exists and contains the expected content
+- [ ] Verify `hello-taskplane.md` exists and matches the expected content
 
 ### Step 3: Delivery
 
@@ -70,6 +78,7 @@ _No additional context needed._
 ## Completion Criteria
 
 - [ ] `hello-taskplane.md` exists in the project root
+- [ ] `hello-taskplane.md` includes a title, task ID (`EXAMPLE-001`), and current date
 - [ ] `.DONE` exists in the task folder
 
 ## Git Commit Convention

package/templates/tasks/EXAMPLE-001-hello-world/STATUS.md

@@ -22,14 +22,14 @@
 **Status:** ⬜ Not Started
 
 - [ ] Create `hello-taskplane.md` in project root
-- [ ] Include date and task ID
+- [ ] Add title, date, and task ID (EXAMPLE-001)
 
 ---
 
 ### Step 2: Verification
 **Status:** ⬜ Not Started
 
-- [ ] Verify file exists with expected content
+- [ ] Verify file exists and matches expected content
 
 ---
 

package/templates/tasks/EXAMPLE-002-parallel-smoke/PROMPT.md

@@ -0,0 +1,98 @@
+# Task: EXAMPLE-002 — Parallel Smoke
+
+**Created:** {{date}}
+**Size:** S
+
+## Review Level: 0 (None)
+
+**Assessment:** Trivial parallel-safe smoke task to demonstrate orchestrator lanes.
+**Score:** 0/8 — Blast radius: 0, Pattern novelty: 0, Security: 0, Reversibility: 0
+
+## Canonical Task Folder
+
+```
+{{tasks_root}}/EXAMPLE-002-parallel-smoke/
+├── PROMPT.md   ← This file (immutable above --- divider)
+├── STATUS.md   ← Execution state (worker updates this)
+├── .reviews/   ← Reviewer output (task-runner creates this)
+└── .DONE       ← Created when complete
+```
+
+## Mission
+
+Create a simple `hello-taskplane-2.md` file in the project root. This task is
+intentionally independent from EXAMPLE-001 so both can run in parallel when
+using `/orch`.
+
+## Expected File Content
+
+`hello-taskplane-2.md` should include:
+
+- A title line (for example: `# Parallel Hello from Taskplane`)
+- A line containing the task ID: `EXAMPLE-002`
+- A short note that this task is parallel-safe
+
+## Dependencies
+
+- **None**
+
+## Context to Read First
+
+_No additional context needed._
+
+## Environment
+
+- **Workspace:** Project root
+- **Services required:** None
+
+## File Scope
+
+- `hello-taskplane-2.md`
+
+## Steps
+
+### Step 0: Preflight
+
+- [ ] Verify this PROMPT.md is readable
+- [ ] Verify STATUS.md exists in the same folder
+
+### Step 1: Create Parallel Hello File
+
+- [ ] Create `hello-taskplane-2.md` in the project root
+- [ ] Add title plus lines containing task ID `EXAMPLE-002` and a parallel-safe note
+
+### Step 2: Verification
+
+- [ ] Verify `hello-taskplane-2.md` exists and matches the expected content
+
+### Step 3: Delivery
+
+- [ ] `.DONE` created in this folder
+
+## Documentation Requirements
+
+**Must Update:** None
+**Check If Affected:** None
+
+## Completion Criteria
+
+- [ ] `hello-taskplane-2.md` exists in the project root
+- [ ] `hello-taskplane-2.md` includes a title, task ID (`EXAMPLE-002`), and a parallel-safe note
+- [ ] `.DONE` exists in the task folder
+
+## Git Commit Convention
+
+- **Implementation:** `feat(EXAMPLE-002): description`
+- **Checkpoints:** `checkpoint: EXAMPLE-002 description`
+
+## Do NOT
+
+- Modify any existing project files
+- Create files outside the project root
+- Add dependencies between EXAMPLE-001 and EXAMPLE-002
+
+---
+
+## Amendments (Added During Execution)
+
+<!-- Workers add amendments here if issues discovered during execution. -->

package/templates/tasks/EXAMPLE-002-parallel-smoke/STATUS.md

@@ -0,0 +1,73 @@
+# EXAMPLE-002: Parallel Smoke — Status
+
+**Current Step:** Not Started
+**Status:** 🔵 Ready for Execution
+**Last Updated:** {{date}}
+**Review Level:** 0
+**Review Counter:** 0
+**Iteration:** 0
+**Size:** S
+
+---
+
+### Step 0: Preflight
+**Status:** ⬜ Not Started
+
+- [ ] Verify PROMPT.md is readable
+- [ ] Verify STATUS.md exists
+
+---
+
+### Step 1: Create Parallel Hello File
+**Status:** ⬜ Not Started
+
+- [ ] Create `hello-taskplane-2.md` in project root
+- [ ] Add title, task ID (EXAMPLE-002), and parallel-safe note
+
+---
+
+### Step 2: Verification
+**Status:** ⬜ Not Started
+
+- [ ] Verify file exists and matches expected content
+
+---
+
+### Step 3: Delivery
+**Status:** ⬜ Not Started
+
+- [ ] `.DONE` created
+
+---
+
+## Reviews
+
+| # | Type | Step | Verdict | File |
+|---|------|------|---------|------|
+
+---
+
+## Discoveries
+
+| Discovery | Disposition | Location |
+|-----------|-------------|----------|
+
+---
+
+## Execution Log
+
+| Timestamp | Action | Outcome |
+|-----------|--------|---------|
+| {{date}} | Task staged | PROMPT.md and STATUS.md created |
+
+---
+
+## Blockers
+
+*None*
+
+---
+
+## Notes
+
+*This is an example task created by `taskplane init` to demonstrate orchestrator-first onboarding.*