@magnusekdahl/parallix 1.0.4 → 1.1.0

package/lib/core/git.js

@@ -50,6 +50,51 @@ function getUncommittedCount(cwd = process.cwd()) {
   return result.stdout.trim().split('\n').length;
 }
 
+function parseUnmergedFiles(output = '') {
+  return Array.from(new Set(
+    output
+      .split('\n')
+      .map(line => line.trim())
+      .filter(Boolean)
+      .map(line => line.split('\t')[1])
+      .filter(Boolean)
+  ));
+}
+
+function detectRebaseState(cwd = process.cwd(), { gitRunner = git, fsModule = require('fs'), pathModule = require('path') } = {}) {
+  const gitDirResult = gitRunner(['-C', cwd, 'rev-parse', '--git-dir']);
+  const resolvedGitDir = gitDirResult.status === 0
+    ? gitDirResult.stdout.trim()
+    : '.git';
+  const gitDir = pathModule.isAbsolute(resolvedGitDir)
+    ? resolvedGitDir
+    : pathModule.join(cwd, resolvedGitDir);
+  const rebaseMergeDir = pathModule.join(gitDir, 'rebase-merge');
+  const rebaseApplyDir = pathModule.join(gitDir, 'rebase-apply');
+  const rebaseDir = fsModule.existsSync(rebaseMergeDir)
+    ? rebaseMergeDir
+    : (fsModule.existsSync(rebaseApplyDir) ? rebaseApplyDir : null);
+
+  const headResult = gitRunner(['-C', cwd, 'symbolic-ref', '--quiet', '--short', 'HEAD']);
+  const detached = headResult.status !== 0;
+
+  const showCurrentResult = gitRunner(['-C', cwd, 'rebase', '--show-current']);
+  const rebaseHead = showCurrentResult.status === 0 ? showCurrentResult.stdout.trim() : '';
+
+  const unmergedResult = gitRunner(['-C', cwd, 'ls-files', '-u']);
+  const unmergedFiles = unmergedResult.status === 0 ? parseUnmergedFiles(unmergedResult.stdout) : [];
+
+  const inProgress = Boolean(rebaseDir || rebaseHead || unmergedFiles.length > 0);
+
+  return {
+    inProgress,
+    rebaseHead,
+    detached,
+    unmergedFiles,
+    rebaseDir
+  };
+}
+
 function getLastCommit() {
   const result = git(['log', '-1', '--format=%H|%ad|%s']);
   const [sha, date, subject] = result.stdout.trim().split('|');
@@ -68,6 +113,7 @@ module.exports = {
   getWorktreeStatus,
   isDirty,
   getUncommittedCount,
+  detectRebaseState,
   getLastCommit,
   getLastThreeCommits
 };

package/lib/core/persistent-data-migration.js

@@ -110,8 +110,16 @@ function serializeStatsRows(rows) {
 function migrateStats(options = {}) {
   const sourcePaths = options.sourcePaths || [options.sourcePath];
   const destinationPath = options.destinationPath || storage.resolveStatsPath({ ensureDir: true });
-  const destinationRows = readStatsRows(destinationPath, options);
   const sourceRows = sourcePaths.flatMap(sourcePath => readStatsRows(sourcePath, options));
+
+  // Fresh-install guard: when no source file exists or all sources are empty,
+  // there is no telemetry to import. Returning early prevents writing a
+  // header-only destination file that would masquerade as valid stats.
+  if (sourceRows.length === 0) {
+    return { destinationPath, imported: 0, rows: 0, warn: 'no source data available' };
+  }
+
+  const destinationRows = readStatsRows(destinationPath, options);
   const rows = [];
   const seen = new Set();
 

package/lib/review/review-loop.js

@@ -20,6 +20,7 @@ const { createEvent, consumeHumanNotes, VALID_EVENT_TYPES } = require('./review-
 const { workflowLauncherStatus, startAgent, eligibleAgentsForStep, selectAgent } = require('../agents/agents');
 const { performHandoff } = require('../commands/handoff');
 const { commitSafeMissionArtifacts, rebaseBeforeReviewRound } = require('./rebase');
+const { resolveAgentModel } = require('../core/product-config');
 
 // Import from review-polling module
 const { POLL_TIMEOUT, delay, resolvePollIntervalMs, resolvePollTimeoutMs, formatElapsed, isPollTimeout, pollForReview, pollForDisposition } = require('./review-polling');
@@ -36,7 +37,7 @@ const { resolveStageTelemetry } = require('../agents/stage-telemetry');
 // Codex writes a fresh-counter rollout per launch, so we sum total_token_usage
 // across every rollout since the FIRST launch for this stored mission phase and
 // agent family. For non-Codex families we accumulate launcher-attached telemetry
-// one launch at a time, de-duped via review-state metadata, so Claude/Qwen rows
+// one launch at a time, de-duped via review-state metadata, so Claude/custom rows
 // are cumulative too. A family switch creates a separate row instead of mixing
 // agents in one record.
 function stageLaunchFingerprint(agentFamily, result) {
@@ -71,7 +72,7 @@ function markStageLaunchRecorded(state, { stage, agentFamily, result, slug, work
   return true;
 }
 
-function recordStageStatsSafe(kind, { stage, slug, rootDir, worktree, implementer, reviewer, result, sinceMs, log, error, state, writeReviewStateFn = writeReviewState }) {
+function recordStageStatsSafe(kind, { stage, slug, rootDir, worktree, implementer, reviewer, result, sinceMs, log, error, state, writeReviewStateFn = writeReviewState, model = null }) {
   let durationMinutes = 0;
   if (result && result.startedAt && result.endedAt) {
     durationMinutes = (Date.parse(result.endedAt) - Date.parse(result.startedAt)) / 60000;
@@ -93,7 +94,7 @@ function recordStageStatsSafe(kind, { stage, slug, rootDir, worktree, implemente
     })) {
       return;
     }
-    stats.accumulateStageStats({ stage, slug, rootDir, implementer, reviewer, telemetry, durationMinutes });
+    stats.accumulateStageStats({ stage, slug, rootDir, implementer, reviewer, telemetry, durationMinutes, model });
   } catch (err) {
     // Best-effort: never escalate to the fatal `error` channel.
     log(fmt.status('WARN', `Could not record ${kind} stats for ${slug}: ${err.message}`));
@@ -593,10 +594,19 @@ async function startReviewLoop(slug, opts = {}) {
 
   log(fmt.status('INFO', `Selected reviewer: ${reviewer} (${reviewerSource})`));
 
-  // Build the canonical ReviewState instance — either from persisted state or fresh
-  const state = persisted && persisted.reviewer === reviewer && persisted.implementer === implementer
-    ? ReviewState.from(slug, persisted)
-    : new ReviewState(slug, { reviewer, implementer });
+  // Build the canonical ReviewState instance. When persisted state exists we
+  // resume from it — preserving round, startedAt, phase, disposition, retry
+  // counts, and metadata — and only overwrite the identities with the ones
+  // selected for this launch (which may differ after a reviewer/implementer
+  // fallback). Constructing fresh would silently reset all persisted progress.
+  let state;
+  if (persisted) {
+    state = ReviewState.from(slug, persisted);
+    state.reviewer = reviewer;
+    state.implementer = implementer;
+  } else {
+    state = new ReviewState(slug, { reviewer, implementer });
+  }
   persistNormalizedPhaseRepair(slug, state, worktree, { log, writeReviewStateFn });
 
   if (persisted && state.round > 1 && !dryRun) {
@@ -703,7 +713,8 @@ async function startReviewLoop(slug, opts = {}) {
             recordStageStatsSafeFn('review', {
               stage: 'review', slug, rootDir: worktree, worktree, reviewer, implementer,
               result: reviewerLaunchResult && reviewerLaunchResult.result,
-              sinceMs: reviewSinceMs, log, error, state, writeReviewStateFn
+              sinceMs: reviewSinceMs, log, error, state, writeReviewStateFn,
+              model: resolveAgentModel(reviewer, worktree),
             });
           }
 
@@ -920,7 +931,8 @@ async function startReviewLoop(slug, opts = {}) {
         recordStageStatsSafeFn('active', {
           stage: 'follow-up', slug, rootDir: worktree, worktree, implementer, reviewer,
           result: implementerLaunchResult && implementerLaunchResult.result,
-          sinceMs: followUpSinceMs, log, error, state, writeReviewStateFn
+          sinceMs: followUpSinceMs, log, error, state, writeReviewStateFn,
+          model: resolveAgentModel(implementer, worktree),
         });
       }
 

package/lib/review/review-prompts.js

@@ -25,7 +25,7 @@ const PROMPT_ENTRYPOINTS = {
   codex:  { review: '$review all',                           actOnReview: '$act-on-review' },
   claude: { review: '/review all',                           actOnReview: '/act-on-review' },
   mistral: { review: '$review all',                           actOnReview: '$act-on-review' },
-  qwen:   { review: '$review all',                           actOnReview: '$act-on-review' },
+  custom: { review: '$review all',                           actOnReview: '$act-on-review' },
   autonomous: { review: '$review all',                       actOnReview: '$act-on-review' }
 };
 

package/lib/review/review.js

@@ -70,6 +70,7 @@ module.exports.consumeReviewerArtifacts = consumeReviewerArtifacts;
 module.exports.consumeImplementerArtifacts = consumeImplementerArtifacts;
 
 // From review-loop
+module.exports.recordStageStatsSafe = recordStageStatsSafe;
 module.exports.maybeUpdateGraphifyBeforeReview = maybeUpdateGraphifyBeforeReview;
 module.exports.commitSafeMissionArtifacts = commitSafeMissionArtifacts;
 module.exports.rebaseBeforeReviewRound = rebaseBeforeReviewRound;

package/lib/tools/forgejo.js

@@ -441,6 +441,17 @@ function createPr(branch, user, token, options = {}) {
     return { ok: false, error: `failed to sync primary baseline: ${syncResult.error || syncResult.stderr}` };
   }
 
+  // 1b. Feature-branch missions target a non-primary PR base that must exist on
+  // the review remote before the PR is opened. syncPrimaryBaseline only mirrors
+  // the primary branch, so push the feature base branch too.
+  if (prBase !== primaryBranch) {
+    log(`Mirroring PR base branch ${prBase} to review remote...`);
+    const baseSync = ensureRemoteBaseBranch(prBase, gitUser, gitToken, rootDir);
+    if (!baseSync.ok) {
+      return { ok: false, error: `failed to sync PR base branch ${prBase}: ${baseSync.error || baseSync.stderr}` };
+    }
+  }
+
   // 2. Push the branch using authenticated URL
   const remoteUrl = authenticatedReviewUrl(gitUser, gitToken, rootDir);
   log(`Pushing ${branch} as Forgejo user ${gitUser}${force || forceWithLease ? ' (force-with-lease)' : ''}...`);
@@ -762,6 +773,35 @@ function syncPrimaryBaseline(user, token, rootDir = process.cwd(), {
   };
 }
 
+function ensureRemoteBaseBranch(baseBranch, user, token, rootDir = process.cwd(), {
+  gitRunner = git.git
+} = {}) {
+  // A feature-branch mission opens its PR against a non-primary base branch.
+  // syncPrimaryBaseline only mirrors the primary branch, so the PR base would
+  // not exist on the review remote and PR creation would fail server-side.
+  // Mirror the local feature base branch here before the PR is opened.
+  const exists = gitRunner(['-C', rootDir, 'show-ref', '--verify', '--quiet', `refs/heads/${baseBranch}`]);
+  if (exists.status !== 0) {
+    return { ok: false, error: `PR base branch ${baseBranch} does not exist locally` };
+  }
+
+  const remoteUrl = authenticatedReviewUrl(user, token, rootDir);
+  // Force-push for the same reason syncPrimaryBaseline force-pushes the primary
+  // branch: the review remote's copy is an intentional server-side mirror of our
+  // local branch. A diverged remote (e.g. from a prior sub-mission integration)
+  // would otherwise reject a fast-forward push and break PR creation.
+  const result = gitRunner(['-C', rootDir, 'push', '--force', remoteUrl, `${baseBranch}:${baseBranch}`], {
+    stdio: 'pipe'
+  });
+
+  return {
+    ok: result.status === 0,
+    status: result.status,
+    stderr: result.stderr,
+    error: result.status === 0 ? null : `${result.stderr || 'git push failed'}${result.error ? ` (${codexSandboxHint()})` : ''}`
+  };
+}
+
 function pushReviewRef(sourceRef, destinationRef, rootDir = process.cwd(), {
   force = false,
   forceWithLease = false,
@@ -1245,6 +1285,7 @@ function syncMerged(branch, mergedCommit, options = {}) {
     forgejoUser,
     rootDir = process.cwd(),
     token: providedToken,
+    baseBranch = null,
     apiCall = forgejoApi,
     resolvePrNumber = getPrNumber,
     gitPush = pushReviewRef,
@@ -1315,11 +1356,17 @@ function syncMerged(branch, mergedCommit, options = {}) {
     };
   };
 
-  let primaryBranch = 'main';
-  try {
-    primaryBranch = getPrimaryBranch(rootDir);
-  } catch (_) {
-    primaryBranch = 'main';
+  // The mission lands back onto its recorded base branch, which is the primary
+  // branch (main) for normal missions but a feature branch (e.g. skunkworks) for
+  // missions started from a feature branch. Pushing the squash commit anywhere
+  // other than that base branch is a non-fast-forward and is rejected.
+  let primaryBranch = baseBranch;
+  if (!primaryBranch) {
+    try {
+      primaryBranch = getPrimaryBranch(rootDir);
+    } catch (_) {
+      primaryBranch = 'main';
+    }
   }
   log(`PR #${prNumber} (${branch}): pushing landed commit ${mergedCommit} to Forgejo ${primaryBranch}...`);
   const pushMasterResult = gitPush(mergedCommit, `refs/heads/${primaryBranch}`, rootDir, { user: forgejoUser, token });
@@ -1578,6 +1625,7 @@ module.exports = {
   reviewRemoteUrl,
   authenticatedReviewUrl,
   syncPrimaryBaseline,
+  ensureRemoteBaseBranch,
   createPr,
   getCommentsSync,
   getComments,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magnusekdahl/parallix",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "description": "AI mission workflow toolkit with a px CLI — local-first, human-in-the-loop multi-agent development",
   "license": "AGPL-3.0-or-later",
   "private": false,

package/prompts/draft.md

@@ -1,10 +1,22 @@
-Mode: draft. No execution.
+Mode: draft. Do not implement the mission — produce the mission contract document only.
 Mission slug: {{slug}}
 Mission path: {{missionPath}}
 Backlog task: {{taskPath}}
 
 The harness has already created the mission branch, worktree, scaffolded `{{missionPath}}`, and ensured the backlog task exists. Your job is to read the user's intent from `{{taskPath}}` and fill `{{missionPath}}` with a real mission contract.
 
+Allowed actions:
+- read files (backlog task, MISSION.md scaffold, graphify index if present)
+- write/edit files (MISSION.md, backlog task labels)
+- run graphify queries and updates
+- run `{{verifyCmd}}` to verify the draft
+
+Forbidden actions:
+- implement any feature or fix described in the mission
+- modify source code outside MISSION.md and the backlog task file
+- run tests beyond the single `{{verifyCmd}}` gate
+- start a review, execute, or integrate phase
+
 Drafting requirements:
 - fill every scaffolded section in `{{missionPath}}` with concrete, non-generic content (no placeholders, no "TBD")
 - include a Goal, Why now, Scope, Out of scope, Success criteria, Risks/assumptions, Checkpoints, Gates, Restricted areas, and Stop rules

package/prompts/review-verbose.md

@@ -16,5 +16,21 @@ Requirements:
 - write the formal review message to `{{artifactDir}}/{{slug}}-review-outcome.md`
 - write the formal review verdict (`approve` or `request-changes`) to `{{artifactDir}}/{{slug}}-review-verdict.txt`; `comment` is not a valid outcome — if you have findings but the criteria pass, use `request-changes`
 - do not post to Forgejo directly; `px` will consume the artifact files, publish them, and advance review state
-- do not edit repo files
 - stop once the artifact files are written
+
+Separation of duties — you are the reviewer, not the implementer. Stay in review-only mode:
+
+You MUST NOT:
+- edit, create, or delete any repo source, config, test, or doc file to fix a problem — report it as a finding instead of touching the file
+- fix bugs, refactor, complete unfinished work, or otherwise "improve" the diff under review; reviewing is not implementing
+- run branch-history operations: no rebase, squash, amend, `git reset`, force-push, or branch deletion
+- run merge or PR operations: no merge, push, opening/closing/merging PRs, or posting to Forgejo directly
+- mutate workflow state: do not write or edit checkpoint documents, mission artifacts, act-on-review files, or any review-loop/review-state files
+
+You MUST:
+- review the full mission diff, confirm the final checkpoint's goal-check evidence, and write the findings, outcome, and verdict artifacts
+- report any inconsistency (workflow state, prompts, PR history) as a finding rather than resolving it yourself
+
+You MAY (these writes are the sole exceptions to "no repo edits"):
+- write to the artifact directory `{{artifactDir}}` (findings, outcome, verdict)
+- create temporary diagnostic files under `/tmp`

package/prompts/review.md

@@ -1,17 +1,50 @@
-Mode: review. No code changes, no repo-state edits.
+Mode: review. No code changes, commits, repo-state edits, or implementer behavior.
 Mission: {{missionPath}}
 Attempt: {{attempt}}. Focus: {{focus}}.
-
 Entrypoint: {{review_entrypoint}}
 
+Load before reviewing:
+- `AGENTS.md`
+- locked mission at `{{missionPath}}`
+- final checkpoint document, if present
+- diff: `git diff {{primaryBranch}}..HEAD`
+
 Minimum loop contract:
 - Load the locked mission at `{{missionPath}}` and `AGENTS.md` before reviewing.
 - Run `px review {{slug}} --verify`.
-- Review the diff with `git diff {{primaryBranch}}..HEAD`. Do a detailed review, since agents tend to miss stuff and just check off boxes in the checkpoints, which is not the intent here.
+- Review as an independent senior engineer. Approve only if the mission is satisfied, verification is credible for the risk level, and the diff is safe to integrate.
+- Request changes for actionable issues introduced or materially worsened by this mission.
 - Confirm the final checkpoint document in the mission directory contains a Goal Check table citing real evidence (file:line, test names).
+Check:
+- mission scope and acceptance criteria
+- final checkpoint claims vs actual diff
+- correctness and regressions
+- tests / gates / verification evidence
+- security and unsafe operations
+- integration with existing code, config, APIs, schemas, docs, or workflows
+- maintainability issues that materially affect future work
+
 - Write findings to `{{artifactDir}}/{{slug}}-review-findings.md`.
 - Write the formal outcome to `{{artifactDir}}/{{slug}}-review-outcome.md` and the legacy verdict (`approve` | `request-changes`) to `{{artifactDir}}/{{slug}}-review-verdict.txt`. `comment` is not a valid outcome: if you have findings but the criteria pass, use `request-changes`.
+- Do not call px directly, the workflow will do that for you
 - Do not post to Forgejo directly; `px review {{slug}} --start` or `--submit` publishes the artifacts.
 - Do not edit repo files; do not switch into implementer behavior.
 - If workflow state, prompts, or PR history are inconsistent, report that inconsistency as a finding rather than fixing it.
 - Graphify-first: before reviewing, check if `graphify-out/graph.json` exists. If it does, run `graphify query "review {{slug}} for correctness and completeness"` to get a graph-based view of the mission scope before examining the diff.
+
+Separation of duties — you are the reviewer, not the implementer. Stay in review-only mode:
+
+You MUST NOT:
+- Edit, create, or delete any repo source, config, test, or doc file to fix a problem — report it as a finding instead of touching the file
+- Fix bugs, refactor, complete unfinished work, or otherwise "improve" the diff under review; reviewing is not implementing
+- Run branch-history operations: no rebase, squash, amend, `git reset`, force-push, or branch deletion
+- Run merge or PR operations: no merge, push, opening/closing/merging PRs, or posting to Forgejo directly
+- Mutate workflow state: do not write or edit checkpoint documents, mission artifacts, act-on-review files, or any review-loop/review-state files
+
+You MUST:
+- Review the full mission diff, confirm the final checkpoint's goal-check evidence, and write the findings, outcome, and verdict artifacts
+- Report any inconsistency (workflow state, prompts, PR history) as a finding rather than resolving it yourself
+
+You MAY (these writes are the sole exceptions to "no repo edits"):
+- Write to the artifact directory `{{artifactDir}}` (findings, outcome, verdict)
+- Create temporary diagnostic files under `/tmp`.

package/tools/setup-forgejo-docker.sh

@@ -67,8 +67,11 @@ cat <<EOF
 [INFO] Next steps:
 [INFO]   1. docker compose -f forgejo/docker-compose.yml up -d
 [INFO]   2. Open http://localhost:\${FORGEJO_PORT:-3300}
-[INFO]   3. Read parallix/docs/forgejo-setup.md for token and remote wiring
-[INFO]   4. Run px setup after export to finish config and review wiring
+[INFO]   3. Create the agent accounts (owner + codex/claude/custom/mistral) with
+[INFO]      'forgejo admin user create' — px setup mints tokens but does not create
+[INFO]      accounts. See parallix/docs/forgejo-setup.md ("Create the agent accounts").
+[INFO]   4. Read parallix/docs/forgejo-setup.md for token and remote wiring
+[INFO]   5. Run px setup after export to finish config and review wiring
 EOF
 
 if [[ ${START} -eq 1 ]]; then