atris 3.31.0 → 3.33.3

package/lib/task-db.js

@@ -469,6 +469,43 @@ function claimTask(db, { id, claimedBy }) {
   return { claimed: false, reason: 'already_' + row.status, claimed_by: row.claimed_by };
 }
 
+function releaseTask(db, { id, actor }) {
+  if (!id) throw new Error('id required');
+  if (!actor) throw new Error('actor required');
+  const row = getTask(db, id);
+  if (!row) return { released: false, reason: 'not_found' };
+  if (row.status !== 'claimed') {
+    return { released: false, reason: `already_${row.status}`, claimed_by: row.claimed_by || null };
+  }
+  if (row.claimed_by !== actor) {
+    return { released: false, reason: 'held_by_other', claimed_by: row.claimed_by || null };
+  }
+  const now = Date.now();
+  const result = withBusyRetry(() => db.prepare(`
+    UPDATE tasks
+       SET status = 'open',
+           claimed_by = NULL,
+           claimed_at = NULL,
+           updated_at = ?
+     WHERE id = ?
+       AND status = 'claimed'
+       AND claimed_by = ?
+  `).run(now, id, actor));
+  if (result.changes !== 1) return { released: false, reason: 'stale_task_state', claimed_by: row.claimed_by || null };
+  const updated = getTask(db, id);
+  const event = appendTaskEvent(db, {
+    taskId: id,
+    workspaceRoot: updated.workspace_root,
+    actor,
+    eventType: 'claim_released',
+    payload: {
+      released_by: actor,
+      previous_claimed_by: row.claimed_by || null,
+    },
+  });
+  return { released: true, row: updated, event };
+}
+
 function doneTask(db, { id, status, actor, allowReview = false, action, proof } = {}) {
   if (!id) throw new Error('id required');
   const final = status || 'done';
@@ -1198,7 +1235,7 @@ function chatTask(db, { id, actor, content, goal, summary }) {
   };
 }
 
-function reviewTask(db, { id, actor, reward, lesson, nextTask, proof, verify, careerXpEligible = false, clearedFields = [] }) {
+function reviewTask(db, { id, actor, reward, lesson, nextTask, proof, verify, careerXpEligible = false, clearedFields = [], landing = {} }) {
   if (!id) throw new Error('id required');
   const row = getTask(db, id);
   if (!row) return { reviewed: false, reason: 'not_found' };
@@ -1213,6 +1250,15 @@ function reviewTask(db, { id, actor, reward, lesson, nextTask, proof, verify, ca
   const clearedReviewFields = Array.isArray(clearedFields)
     ? Array.from(new Set(clearedFields.filter(field => field === 'lesson' || field === 'next_task')))
     : [];
+  const landingInput = landing && typeof landing === 'object' ? landing : {};
+  let landingUpdated = false;
+  for (const key of ['happened', 'checked', 'tested', 'decision']) {
+    const cleaned = cleanLandingText(landingInput[key]);
+    if (cleaned) {
+      metadata[`landing_${key}`] = cleaned;
+      landingUpdated = true;
+    }
+  }
   const reviewingPendingProof = row.status === 'review'
     && metadata.approval_status === 'pending'
     && numericReward <= 0
@@ -1250,7 +1296,7 @@ function reviewTask(db, { id, actor, reward, lesson, nextTask, proof, verify, ca
     metadata.accepted_at = new Date().toISOString();
     metadata.accepted_by = reviewer;
   }
-  if (reviewingPendingProof || updatingPendingReviewProof || (numericReward > 0 && row.status === 'done')) {
+  if (reviewingPendingProof || updatingPendingReviewProof || (numericReward > 0 && row.status === 'done') || landingUpdated) {
     withBusyRetry(() => db.prepare(`
       UPDATE tasks
          SET metadata = ?,
@@ -1271,6 +1317,14 @@ function reviewTask(db, { id, actor, reward, lesson, nextTask, proof, verify, ca
     payload.agent_certified = metadata.agent_certified === true;
     payload.agent_certification_policy = metadata.agent_certification_policy || null;
   }
+  if (landingUpdated) {
+    payload.landing = {
+      happened: metadata.landing_happened || null,
+      checked: metadata.landing_checked || null,
+      tested: metadata.landing_tested || null,
+      decision: metadata.landing_decision || null,
+    };
+  }
   if (clearedReviewFields.length) payload.cleared_review_fields = clearedReviewFields;
   const event = appendTaskEvent(db, {
     taskId: id,
@@ -1704,6 +1758,7 @@ module.exports = {
   getTask,
   listTasks,
   claimTask,
+  releaseTask,
   backlogTask,
   clearPlanTasks,
   doneTask,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atris",
-  "version": "3.31.0",
+  "version": "3.33.3",
   "main": "bin/atris.js",
   "bin": {
     "atris": "bin/atris.js",
@@ -12,6 +12,7 @@
     "cli/*.py",
     "commands/",
     "decks/",
+    "scripts/agent_worktree.py",
     "utils/",
     "lib/",
     "templates/",
@@ -55,7 +56,7 @@
     "test": "node --test",
     "lint:decks": "node scripts/lint-all-decks.js",
     "publish:release": "node scripts/publish-atris-release.js",
-    "prepare": "cp scripts/pre-commit .git/hooks/pre-commit 2>/dev/null && chmod +x .git/hooks/pre-commit || true"
+    "prepare": "cp scripts/pre-commit .git/hooks/pre-commit 2>/dev/null && cp scripts/commit-msg .git/hooks/commit-msg 2>/dev/null && cp scripts/prepare-commit-msg .git/hooks/prepare-commit-msg 2>/dev/null && chmod +x .git/hooks/pre-commit .git/hooks/commit-msg .git/hooks/prepare-commit-msg || true"
   },
   "keywords": [
     "atrisdev",

package/scripts/agent_worktree.py

@@ -0,0 +1,72 @@
+#!/usr/bin/env python3
+"""Compatibility wrapper for older agent worktree instructions.
+
+Use the canonical Atris CLI:
+  atris worktree start --agent <agent> --task "<task>"
+"""
+
+from __future__ import annotations
+
+import argparse
+import subprocess
+import sys
+from pathlib import Path
+
+
+def build_parser() -> argparse.ArgumentParser:
+    parser = argparse.ArgumentParser(
+        prog="scripts/agent_worktree.py",
+        description="Compatibility wrapper around `atris worktree start`.",
+    )
+    subcommands = parser.add_subparsers(dest="command", required=True)
+
+    create = subcommands.add_parser("create", help="Create an Atris agent worktree.")
+    owner = create.add_mutually_exclusive_group(required=True)
+    owner.add_argument("--agent")
+    owner.add_argument("--member")
+    create.add_argument("--task", required=True)
+    create.add_argument("--base")
+    create.add_argument("--path")
+    create.add_argument("--branch")
+    create.add_argument("--claim", action="store_true")
+    return parser
+
+
+def main(argv: list[str]) -> int:
+    args = build_parser().parse_args(argv)
+    repo_root = Path(__file__).resolve().parents[1]
+    atris_bin = repo_root / "bin" / "atris.js"
+
+    # Run the Node CLI directly so this wrapper works before a global `atris`
+    # binary is on PATH.
+    command = ["node", str(atris_bin), "worktree", "start"]
+    display = ["atris", "worktree", "start"]
+    if args.member:
+        command += ["--member", args.member]
+        display += ["--member", args.member]
+    else:
+        command += ["--agent", args.agent]
+        display += ["--agent", args.agent]
+    command += ["--task", args.task]
+    display += ["--task", args.task]
+    if args.base:
+        command += ["--base", args.base]
+        display += ["--base", args.base]
+    if args.path:
+        command += ["--path", args.path]
+        display += ["--path", args.path]
+    if args.branch:
+        command += ["--branch", args.branch]
+        display += ["--branch", args.branch]
+    if args.claim:
+        command.append("--claim")
+        display.append("--claim")
+
+    print("compat: scripts/agent_worktree.py maps to:")
+    print(f"  {' '.join(display)}")
+    result = subprocess.run(command)
+    return int(result.returncode or 0)
+
+
+if __name__ == "__main__":
+    raise SystemExit(main(sys.argv[1:]))