peaks-cli 1.0.25 → 1.0.27

package/dist/src/cli/commands/core-artifact-commands.js

@@ -9,6 +9,7 @@ import { listSkills } from '../../services/skills/skill-registry.js';
 import { inspectSkillRunbook } from '../../services/skills/skill-runbook-service.js';
 import { setSkillPresence, clearSkillPresence, getSkillPresence, isSkillPresenceMode, touchSkillHeartbeat } from '../../services/skills/skill-presence-service.js';
 import { ensureSession, getSessionMeta, setSessionMeta, setSessionTitle, listSessionMetas } from '../../services/session/session-manager.js';
+import { findProjectRoot } from '../../services/config/config-safety.js';
 import { fail, ok } from '../../shared/result.js';
 import { addJsonOption, failUnsupportedNonDryRun, getErrorMessage, isArtifactProvider, isArtifactSetupStep, printResult } from '../cli-helpers.js';
 export function registerCoreAndArtifactCommands(program, io) {
@@ -80,7 +81,7 @@ export function registerCoreAndArtifactCommands(program, io) {
         }
         const presence = setSkillPresence(name, options.mode, options.gate);
         // Also update session metadata so session dirs self-document
-        const projectRoot = process.cwd();
+        const projectRoot = findProjectRoot(process.cwd()) ?? process.cwd();
         const sessionId = await ensureSession(projectRoot);
         setSessionMeta(projectRoot, sessionId, {
             skill: name,
@@ -129,14 +130,14 @@ export function registerCoreAndArtifactCommands(program, io) {
     addJsonOption(session
         .command('list')
         .description('List all session directories with titles and metadata')).action((options) => {
-        const projectRoot = process.cwd();
+        const projectRoot = findProjectRoot(process.cwd()) ?? process.cwd();
         const metas = listSessionMetas(projectRoot);
         printResult(io, ok('session.list', { sessions: metas, total: metas.length }), options.json);
     });
     addJsonOption(session
         .command('info <sessionId>')
         .description('Show full metadata for a session directory')).action((sessionId, options) => {
-        const projectRoot = process.cwd();
+        const projectRoot = findProjectRoot(process.cwd()) ?? process.cwd();
         const meta = getSessionMeta(projectRoot, sessionId);
         if (meta === null) {
             printResult(io, fail('session.info', 'SESSION_NOT_FOUND', `Session "${sessionId}" not found or has no metadata`, { sessionId }, ['Use `peaks session list` to see available sessions']), options.json);
@@ -148,7 +149,7 @@ export function registerCoreAndArtifactCommands(program, io) {
     addJsonOption(session
         .command('title <sessionId> <title>')
         .description('Set a human-readable title for a session directory')).action((sessionId, title, options) => {
-        const projectRoot = process.cwd();
+        const projectRoot = findProjectRoot(process.cwd()) ?? process.cwd();
         try {
             const meta = setSessionTitle(projectRoot, sessionId, title);
             printResult(io, ok('session.title', meta), options.json);

package/dist/src/cli/commands/workflow-commands.js

@@ -10,12 +10,14 @@ import { validateChangeIdOrThrow } from '../../shared/change-id.js';
 import { getEconomyAwareExecutionModelId } from '../../services/config/model-routing.js';
 import { getLocalArtifactPath } from '../../services/artifacts/workspace-service.js';
 import { getSessionId } from '../../services/session/session-manager.js';
+import { findProjectRoot } from '../../services/config/config-safety.js';
 import { verifyPipeline } from '../../services/workflow/pipeline-verify-service.js';
 import { fail, ok } from '../../shared/result.js';
 import { addJsonOption, failUnsupportedNonDryRun, getErrorMessage, isRecommendationWorkflow, printResult } from '../cli-helpers.js';
 function getCurrentWorkspaceContext() {
     try {
-        const sessionId = getSessionId(process.cwd());
+        const projectRoot = findProjectRoot(process.cwd()) ?? process.cwd();
+        const sessionId = getSessionId(projectRoot);
         return sessionId ? { sessionId, sessionDir: `.peaks/${sessionId}` } : {};
     }
     catch {
@@ -24,7 +26,8 @@ function getCurrentWorkspaceContext() {
 }
 function getWorkflowWorkspaceContext() {
     try {
-        const workspace = getWorkspaceConfigForPath(process.cwd());
+        const projectRoot = findProjectRoot(process.cwd()) ?? process.cwd();
+        const workspace = getWorkspaceConfigForPath(projectRoot);
         if (!workspace)
             return {};
         return { workspace, artifactWorkspacePath: getLocalArtifactPath(workspace) };

package/dist/src/services/config/config-safety.js

@@ -50,34 +50,44 @@ export function findProjectRoot(startPath) {
     const homeBoundaryPaths = getHomeBoundaryPaths();
     let current = resolve(startPath);
     let parent = dirname(current);
+    let pkgRoot = null;
     while (current !== parent && !homeBoundaryPaths.has(normalizeBoundaryPath(current))) {
         if (existsSync(resolve(current, '.peaks', 'config.json')) && isSafeProjectConfigMarker(current)) {
             return current;
         }
-        if (existsSync(resolve(current, 'package.json')) || existsSync(resolve(current, '.git'))) {
+        // .git is the definitive project root — return immediately
+        if (existsSync(resolve(current, '.git'))) {
             return current;
         }
+        // package.json alone is ambiguous in monorepos — keep walking up for .git
+        if (pkgRoot === null && existsSync(resolve(current, 'package.json'))) {
+            pkgRoot = current;
+        }
         parent = current;
         current = dirname(parent);
     }
-    return null;
+    return pkgRoot;
 }
 export function resolveProjectRootForConfig(startPath) {
     const start = resolve(startPath);
     const homeBoundaryPaths = getHomeBoundaryPaths();
     let current = start;
     let parent = dirname(current);
+    let pkgRoot = null;
     while (current !== parent && !homeBoundaryPaths.has(normalizeBoundaryPath(current))) {
         if (existsSync(resolve(current, '.peaks', 'config.json')) && isSafeProjectConfigMarker(current)) {
             return current;
         }
-        if (existsSync(resolve(current, 'package.json')) || existsSync(resolve(current, '.git'))) {
+        if (existsSync(resolve(current, '.git'))) {
             return current;
         }
+        if (pkgRoot === null && existsSync(resolve(current, 'package.json'))) {
+            pkgRoot = current;
+        }
         parent = current;
         current = dirname(parent);
     }
-    return start;
+    return pkgRoot ?? start;
 }
 export function getProjectConfigPath(projectRoot) {
     if (!projectRoot)

package/dist/src/services/skills/skill-presence-service.d.ts

@@ -5,6 +5,7 @@ export type SkillPresence = {
     skill: string;
     mode?: SkillPresenceMode;
     gate?: string;
+    sessionId?: string;
     setAt: string;
     lastHeartbeat?: string;
 };

package/dist/src/services/skills/skill-presence-service.js

@@ -1,5 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
+import { findProjectRoot } from '../config/config-safety.js';
 export const VALID_SKILL_PRESENCE_MODES = [
     'full-auto',
     'assisted',
@@ -10,19 +11,39 @@ export function isSkillPresenceMode(value) {
     return VALID_SKILL_PRESENCE_MODES.includes(value);
 }
 const PRESENCE_FILE = '.peaks/.active-skill.json';
+const SESSION_FILE = '.peaks/.session.json';
+function resolveProjectRoot() {
+    return findProjectRoot(process.cwd()) ?? process.cwd();
+}
 function resolvePresencePath() {
-    return resolve(process.cwd(), PRESENCE_FILE);
+    return resolve(resolveProjectRoot(), PRESENCE_FILE);
+}
+function getCurrentSessionId() {
+    const sessionPath = resolve(resolveProjectRoot(), SESSION_FILE);
+    if (!existsSync(sessionPath))
+        return null;
+    try {
+        const data = JSON.parse(readFileSync(sessionPath, 'utf8'));
+        return typeof data.sessionId === 'string' && data.sessionId.length > 0
+            ? data.sessionId
+            : null;
+    }
+    catch {
+        return null;
+    }
 }
 export function exportSkillPresence() {
     return resolvePresencePath();
 }
 export function setSkillPresence(skill, mode, gate) {
     const validatedMode = mode && isSkillPresenceMode(mode) ? mode : undefined;
+    const sessionId = getCurrentSessionId();
     const now = new Date().toISOString();
     const presence = {
         skill,
         ...(validatedMode ? { mode: validatedMode } : {}),
         ...(gate ? { gate } : {}),
+        ...(sessionId ? { sessionId } : {}),
         setAt: now,
         lastHeartbeat: now
     };
@@ -45,6 +66,13 @@ export function getSkillPresence() {
         if (typeof parsed?.skill !== 'string' || parsed.skill.length === 0) {
             return null;
         }
+        if (typeof parsed.sessionId === 'string' && parsed.sessionId.length > 0) {
+            const currentSessionId = getCurrentSessionId();
+            if (currentSessionId && parsed.sessionId !== currentSessionId) {
+                unlinkSync(presencePath);
+                return null;
+            }
+        }
         return parsed;
     }
     catch {
@@ -62,6 +90,13 @@ export function touchSkillHeartbeat() {
         if (typeof parsed?.skill !== 'string' || parsed.skill.length === 0) {
             return null;
         }
+        if (typeof parsed.sessionId === 'string' && parsed.sessionId.length > 0) {
+            const currentSessionId = getCurrentSessionId();
+            if (currentSessionId && parsed.sessionId !== currentSessionId) {
+                unlinkSync(presencePath);
+                return null;
+            }
+        }
         parsed.lastHeartbeat = new Date().toISOString();
         writeFileSync(presencePath, JSON.stringify(parsed, null, 2), 'utf8');
         return parsed;

package/dist/src/shared/change-id.js

@@ -6,6 +6,7 @@
 import { posix, join } from 'node:path';
 import { getNextNumber, buildNumberedFilename } from './incrementing-number.js';
 import { getSessionId } from '../services/session/session-manager.js';
+import { findProjectRoot } from '../services/config/config-safety.js';
 const CHANGE_ID_PATTERN = /^[A-Za-z0-9._-]+$/;
 function normalizeForwardSlashes(input) {
     return input.replace(/\\/g, '/');
@@ -75,10 +76,11 @@ export function isUnsafeArtifactPath(path) {
  */
 export function buildArtifactRelativePath(changeId, ...segments) {
     validateChangeIdOrThrow(changeId);
-    const sessionId = getSessionId(process.cwd());
+    const projectRoot = findProjectRoot(process.cwd()) ?? process.cwd();
+    const sessionId = getSessionId(projectRoot);
     if (sessionId && segments.length > 0 && segments[0]) {
         const role = normalizeForwardSlashes(segments[0]);
-        const dirPath = join(process.cwd(), '.peaks', sessionId, role);
+        const dirPath = join(projectRoot, '.peaks', sessionId, role);
         if (isUnsafeArtifactPath(role) || isUnsafeArtifactPath(sessionId)) {
             throw new ChangeIdValidationError(changeId);
         }

package/dist/src/shared/version.d.ts

@@ -1 +1 @@
-export declare const CLI_VERSION = "1.0.25";
+export declare const CLI_VERSION = "1.0.27";

package/dist/src/shared/version.js

@@ -1 +1 @@
-export const CLI_VERSION = "1.0.25";
+export const CLI_VERSION = "1.0.27";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "peaks-cli",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "description": "Peaks CLI and short skill family for Claude Code automation.",
   "author": "SquabbyZ",
   "license": "MIT",
@@ -35,7 +35,7 @@
     "dev:watch": "node ./scripts/watch.mjs",
     "test": "vitest run",
     "test:coverage": "vitest run --coverage",
-    "pretest:coverage": "pkill -f vitest 2>/dev/null; rm -rf coverage; exit 0",
+    "pretest:coverage": "node ./scripts/pretest-coverage.mjs",
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "engines": {

package/skills/peaks-solo/SKILL.md

@@ -576,6 +576,14 @@ After `peaks-rd` finishes any implementation, repair, or code-output slice, Peak
 
 Solo is itself a skill running in the current session. To "invoke peaks-rd" or "peaks-qa", Solo MUST use the `Skill` tool with the role's name (e.g. `Skill(skill="peaks-rd")` or `Skill(skill="peaks-qa")`), passing the `<request-id>` and `<session-id>` as arguments so the role reads the same artifacts Solo wrote. Do NOT re-implement the role's logic inline in Solo. Do NOT use the `Agent` tool with a sub-agent — role skills are skills, not agents. After the role skill returns, Solo reads the artifacts the role wrote (via the request artifact path or `peaks request show <rid> --role <role>`) to decide the next step.
 
+**Presence restoration after role skill returns (MANDATORY):** Role skills (peaks-rd, peaks-qa, peaks-ui) call `peaks skill presence:set <role>` internally, which overwrites `.peaks/.active-skill.json`. After EVERY role skill returns — whether success, repair-needed, or failure — Solo MUST immediately restore the orchestrator presence by re-running the same presence command from Step 2:
+
+```bash
+peaks skill presence:set peaks-solo --mode <mode> --gate <current-gate>
+```
+
+This keeps the CLAUDE.md status header accurate (`Peaks-Cli Skill: peaks-solo`) instead of showing a stale role name. Use the current mode and gate values; the gate may have advanced since startup. Skipping this step causes the header to display the last role skill name permanently.
+
 **Full-auto auto-proceed rule**: In the `full-auto` profile, when RD transitions to `qa-handoff`, Solo immediately invokes `peaks-qa` via the Skill tool with the same `<request-id>`. Do not pause, do not ask the user, do not summarize RD results as if they were final. The only valid reason to skip QA is when `--type` is `docs` or `chore` (no acceptance surface).
 
 A QA report with any failing, blocked, missing, or unverified acceptance item is not a pass.
@@ -596,12 +604,16 @@ When `peaks-qa` returns `verdict=return-to-rd`, Solo does NOT manually rewrite R
 4. peaks-rd fixes the reported issues only (red-line scope: do not modify unrelated surfaces), regenerates code-review and security-review evidence if changes touched reviewed surfaces, then transitions `rd → implemented → qa-handoff` again.
 5. Solo invokes `peaks-qa` again with the same `<request-id>` (the same Skill call as before). QA re-runs gates against the new diff.
 6. Repeat steps 1-5 until QA returns `verdict=pass`, or the cap below fires.
+   **After each repair iteration** (after peaks-rd and peaks-qa both return), Solo MUST restore presence:
+   ```bash
+   peaks skill presence:set peaks-solo --mode <mode> --gate repair-cycle-<N>
+   ```
 
 **Repair cycle cap**: After 3 repair cycles without a passing QA verdict, emit a blocked TXT handoff regardless of remaining issues. Do not loop indefinitely. If a specific issue cannot be resolved within 3 cycles, mark it as a known blocker in the TXT handoff and proceed to the SC phase.
 
 In full-auto mode, treat the RD↔QA repair loop as a built-in controller objective: loop through RD→QA until all acceptance items pass (max 3 cycles). Do not exit the loop on a non-passing QA verdict unless the TXT handoff marks the workflow as blocked.
 
-## Peaks-Cli Default runbook
+## Default runbook
 
 > **Maintenance**: The numbered workflow list above (steps 0-11) is the canonical phase sequence. This runbook is the executable CLI transcription. When updating this skill, keep both in lockstep — a change to one must be reflected in the other.
 
@@ -775,7 +787,7 @@ Do NOT call `peaks skill presence:clear` at workflow end. The presence file and
 
 **Codegraph**: Optional project-analysis before RD handoff. Use `peaks codegraph affected --project <path> <changed-files...> --json` for regression-surface hints. Output as untrusted supporting evidence only; never commit `.codegraph/` artifacts.
 
-## Peaks-Cli Codegraph orchestration context
+## Codegraph orchestration context
 
 Solo treats `peaks codegraph affected --project <path> <changed-files...> --json` as an optional project-analysis enhancement that informs the role handoff between PRD, RD, and QA. The output is untrusted supporting evidence — Solo must not treat codegraph output as approval for scope, design, or QA verdict.