peaks-cli 1.3.1 → 1.3.2

package/dist/src/services/workspace/workspace-service.js

@@ -1,36 +1,8 @@
 import { mkdir } from 'node:fs/promises';
 import { join } from 'node:path';
 import { isDirectory } from '../../shared/fs.js';
-import { getSessionId, setCurrentSessionBinding } from '../session/session-manager.js';
+import { getSessionId, setCurrentSessionBinding, setSessionMeta } from '../session/session-manager.js';
 import { setCurrentChangeId } from '../../shared/change-id.js';
-/**
- * Per-slice subdirectories created **inside the change-id dir**
- * (`.peaks/<change-id>/...`). These are the reviewable
- * artifacts and are tracked in git. The `system/` subdir is
- * intentionally NOT in this list — it lives under the session
- * dir (`.peaks/_runtime/<session-id>/system/`), since it holds
- * live sub-agent progress and spawn records, which are ephemeral.
- */
-const CHANGE_ARTIFACT_SUBDIRECTORIES = [
-    'prd/source',
-    'prd/requests',
-    'ui/requests',
-    'rd/requests',
-    'qa/test-cases',
-    'qa/test-reports',
-    'qa/requests',
-    'qa/screenshots',
-    'sc',
-    'txt'
-];
-/**
- * Per-session subdirectories created **inside the session dir**
- * (`.peaks/_runtime/<session-id>/...`). These are the ephemeral
- * state and are gitignored.
- */
-const SESSION_EPHEMERAL_SUBDIRECTORIES = [
-    'system'
-];
 const SESSION_ID_PATTERN = /^\d{4}-\d{2}-\d{2}-[a-z][a-z0-9-]*[a-z0-9]$/;
 const PROHIBITED_SUFFIXES = ['session', 'work', 'task', 'test', 'temp', 'tmp'];
 // Auto-generated session ID pattern: YYYY-MM-DD-session-<6位hex>
@@ -77,14 +49,21 @@ export function validateSessionId(sessionId) {
 }
 export async function initWorkspace(options) {
     validateSessionId(options.sessionId);
-    // Phase 6 refactor (slice 2026-06-05-change-id-as-unit-of-work):
-    //   - Reviewable artifacts (rd/, qa/, prd/, txt/) are created at
+    // Phase 6 refactor (slice 2026-06-05-change-id-as-unit-of-work) +
+    // slice 006 (2026-06-06-change-folder-simplify-and-lazy-role-subdirs):
+    //   - Reviewable artifacts (rd/, qa/, prd/, txt/) live at
     //     `.peaks/<change-id>/<role>/` (tracked in git) when a change-id
-    //     is given. This is the canonical home for cross-session content.
+    //     is given. The role subdirs are NOT pre-created — the writer
+    //     (e.g. `peaks request init`, `peaks rd`) creates the parent
+    //     dirs on demand via `mkdirSync(..., { recursive: true })`.
     //   - The session dir `.peaks/_runtime/<session-id>/` (gitignored)
-    //     holds only ephemeral state — currently `system/` (live
-    //     sub-agent progress + spawn records). The session id remains
-    //     the binding for that ephemeral state.
+    //     now holds ONLY the canonical `session.json` metadata. The
+    //     F3-introduced `system/` subdir is gone — slice 006 removes
+    //     it via `peaks workspace reconcile`; new init calls do not
+    //     pre-create it.
+    //   - The change-id dir is created when `--change-id` is given,
+    //     but its role subdirs (prd/, qa/, rd/, sc/, txt/) are NOT
+    //     pre-created either — same lazy-mkdir rule.
     //
     // The CLI accepts `--change-id <id>` to bind the change. The legacy
     // session-scoped layout (`.peaks/<session-id>/<role>/<file>`) is
@@ -95,8 +74,8 @@ export async function initWorkspace(options) {
     const created = [];
     const alreadyExisted = [];
     // 1. Create the session dir (canonical location `.peaks/_runtime/<sid>/`)
-    //    with ONLY ephemeral subdirs (`system/`). The session dir is
-    //    gitignored.
+    //    with NO subdirs. The session dir is gitignored; the role
+    //    subdirs and the `system/` subdir are gone entirely (slice 006).
     if (await isDirectory(sessionRoot)) {
         alreadyExisted.push('.');
     }
@@ -104,22 +83,20 @@ export async function initWorkspace(options) {
         await mkdir(sessionRoot, { recursive: true });
         created.push('.');
     }
-    for (const sub of SESSION_EPHEMERAL_SUBDIRECTORIES) {
-        const full = join(sessionRoot, sub);
-        if (await isDirectory(full)) {
-            alreadyExisted.push(sub);
-        }
-        else {
-            await mkdir(full, { recursive: true });
-            created.push(sub);
-        }
-    }
+    // 1a. Write the per-session metadata file. Slice 006 makes
+    //     `.peaks/_runtime/<sid>/session.json` the durable session
+    //     metadata (the body's source of truth, the `peaks workspace
+    //     reconcile` discovery source). The file is created on first
+    //     init and refreshed on every subsequent init. Idempotent.
+    setSessionMeta(options.projectRoot, options.sessionId, {});
     // 2. If a change-id is given, also create the change-id dir at
-    //    `.peaks/<change-id>/` (tracked) with the reviewable subdirs.
-    //    When the caller did NOT specify a change-id, this step is
-    //    skipped — reviewable writes for this session are then blocked
-    //    until a change-id is bound (or the user re-runs init with
-    //    `--change-id`). Surfaces in `changeIdAction: 'none'`.
+    //    `.peaks/<change-id>/` (tracked) with NO role subdirs. The
+    //    role subdirs (prd/, qa/, rd/, sc/, txt/) are created on demand
+    //    by the writer at the write site. When the caller did NOT
+    //    specify a change-id, this step is skipped — reviewable writes
+    //    for this session are then blocked until a change-id is bound
+    //    (or the user re-runs init with `--change-id`). Surfaces in
+    //    `changeIdAction: 'none'`.
     let resolvedChangeId = null;
     let changeIdAction = 'none';
     if (options.changeId !== undefined && options.changeId.length > 0) {
@@ -132,16 +109,6 @@ export async function initWorkspace(options) {
             await mkdir(changeDir, { recursive: true });
             created.push(resolvedChangeId);
         }
-        for (const sub of CHANGE_ARTIFACT_SUBDIRECTORIES) {
-            const full = join(changeDir, sub);
-            if (await isDirectory(full)) {
-                alreadyExisted.push(sub);
-            }
-            else {
-                await mkdir(full, { recursive: true });
-                created.push(sub);
-            }
-        }
         // 3. Bind the change-id so RD/QA/PRD services know where to write
         //    reviewable artifacts. The binding is a symlink at
         //    `.peaks/_runtime/current-change` pointing at the change-id dir.

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

@@ -1 +1 @@
-export declare const CLI_VERSION = "1.3.1";
+export declare const CLI_VERSION = "1.3.2";

package/dist/src/shared/version.js

@@ -1 +1 @@
-export const CLI_VERSION = "1.3.1";
+export const CLI_VERSION = "1.3.2";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "peaks-cli",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Cross-AI-IDE workflow-gating CLI + skill family (Claude Code shipped, Trae in progress; Codex / Cursor / Qoder / Tongyi Lingma on the roadmap).",
   "author": "SquabbyZ",
   "license": "MIT",

package/schemas/doctor-report.schema.json

@@ -13,8 +13,8 @@
         "properties": {
           "id": {
             "type": "string",
-            "pattern": "^(skill|skill-name|skill-parse|skill-runbook|skill-apply-note|skill-presence|statusline|schema|config|doctor-self|capability):[A-Za-z0-9][A-Za-z0-9._-]*$",
-            "description": "Stable check id. Known prefixes: skill:<name> (required skill present), skill-name:<dir> (directory matches declared name), skill-parse:<dir> (skill metadata parsed), skill-runbook:<name> (Default runbook section exists), skill-apply-note:<name> (destructive --apply lines carry an authorization/--dry-run note), skill-presence:<topic> (status of .peaks/.active-skill.json — current/freshness/workspace), statusline:<topic> (out-of-band Claude Code statusLine — install/runtime), schema:<file> (schema file exists and is valid JSON), config:<scope> (optional config locations), doctor-self:<topic> (doctor validates its own output against this schema), capability:<name> (third-party capability is resolvable at the pinned version)."
+            "pattern": "^(skill|skill-name|skill-parse|skill-runbook|skill-apply-note|skill-presence|statusline|schema|config|doctor-self|capability|build):[A-Za-z0-9][A-Za-z0-9._-]*$",
+            "description": "Stable check id. Known prefixes: skill:<name> (required skill present), skill-name:<dir> (directory matches declared name), skill-parse:<dir> (skill metadata parsed), skill-runbook:<name> (Default runbook section exists), skill-apply-note:<name> (destructive --apply lines carry an authorization/--dry-run note), skill-presence:<topic> (status of .peaks/.active-skill.json — current/freshness/workspace), statusline:<topic> (out-of-band Claude Code statusLine — install/runtime), schema:<file> (schema file exists and is valid JSON), config:<scope> (optional config locations), doctor-self:<topic> (doctor validates its own output against this schema), capability:<name> (third-party capability is resolvable at the pinned version), build:<topic> (build-hygiene checks — dist/source version consistency)."
           },
           "ok": { "type": "boolean" },
           "message": { "type": "string", "minLength": 1 }

package/skills/peaks-qa/SKILL.md

@@ -62,6 +62,7 @@ This is the hard-block replacement for the previous "wait for the user" prose. W
 
 When this skill is launched as a sub-agent via `Task(subagent_type="general-purpose", ...)` from `peaks-solo`, the following sections of THIS skill are **suspended** for the sub-agent run:
 
+- **Session id** — use the parent's sid (read `.peaks/_runtime/session.json` or pass `--session-id <parent-sid>` to any session-creating CLI). Do NOT spawn your own session. The new `peaks session info --active` reads the canonical binding for you.
 - **Skill presence (MANDATORY first action)** — do NOT call `peaks skill presence:set peaks-qa`. The sub-agent must not overwrite `.peaks/.active-skill.json`; the main Solo loop owns that file. If you need to mark your own state, write a marker file at `.peaks/<session-id>/system/sub-agent-qa.json` and only that.
 - **Workspace initialization** — Solo has already run `peaks workspace init` before fan-out. Do not re-run it.
 - **Mode selection** — Solo has already chosen the mode.

package/skills/peaks-rd/SKILL.md

@@ -39,6 +39,7 @@ The full hard-block contract is defined in `peaks-qa` (see "Hard contracts for b
 
 When this skill is launched as a sub-agent via `Task(subagent_type="general-purpose", ...)` from `peaks-solo`, the following sections of THIS skill are **suspended** for the sub-agent run:
 
+- **Session id** — use the parent's sid (read `.peaks/_runtime/session.json` or pass `--session-id <parent-sid>` to any session-creating CLI). Do NOT spawn your own session. The new `peaks session info --active` reads the canonical binding for you.
 - **Skill presence (MANDATORY first action)** — do NOT call `peaks skill presence:set peaks-rd`. The sub-agent must not overwrite `.peaks/.active-skill.json`; the main Solo loop owns that file. If you need to mark your own state, write a marker file at `.peaks/<session-id>/system/sub-agent-rd.json` and only that.
 - **Workspace initialization** — Solo has already run `peaks workspace init` before fan-out. Do not re-run it.
 - **Mode selection** — Solo has already chosen the mode. Read it from the prompt arguments (or from `.peaks/.active-skill.json` if you can, but do not write it).
@@ -46,7 +47,7 @@ When this skill is launched as a sub-agent via `Task(subagent_type="general-purp
 
 What the sub-agent **MUST** still do, from this skill's contract:
 
-0. **Do NOT call `peaks request init`** — Solo has already initialised the request artefact slot in the main loop before fan-out (the runbook has the exact `peaks request init --role rd --id <rid> --project <repo> --apply --type <type> --json` call). The sub-agent reads the slot via `peaks request show <rid> --role rd --project <repo> --json` if it needs to.
+0. **Do NOT call `peaks request init`** — Solo has already initialised the request artefact slot in the main loop before fan-out (the runbook has the exact `peaks request init --role rd --id <rid> --project <repo> --apply --type <type> --json` call). The sub-agent reads the slot via `peaks request show <rid> --role rd --project <repo> --json` if it needs to. Note: `peaks request init` is **dry-run by default**. Pass `--apply` to actually create the artifact.
 2. `peaks request show <rid> --role prd --project <repo> --json` (and `--role ui` if UI is in the swarm plan).
 3. Standards preflight (dry-run only; Solo owns the apply step).
 4. Project-scan read; create `rd/project-scan.md` only if Solo flagged it missing in the dispatch prompt.

package/skills/peaks-solo/SKILL.md

@@ -262,6 +262,12 @@ peaks session title $(cat .peaks/.session.json | python3 -c "import sys,json; pr
 
 If the session directory already has a title (check via `peaks session list --json`), skip this step — the title is already set.
 
+## Sub-agent session sharing (MANDATORY — one conversation = one sid)
+
+When peaks-solo dispatches a sub-agent (peaks-rd, peaks-qa, peaks-ui, peaks-txt, peaks-sc), the sub-agent prompt MUST include the parent's session id. The sub-agent then passes `--session-id <parent-sid>` for any session-creating CLI call (e.g. `peaks request init --session-id <parent-sid>`). The sub-agent MUST NOT call `peaks workspace init` — that would create a new session dir and orphan the parent's binding. The sub-agent reads `.peaks/_runtime/session.json` to discover the parent's sid (or the orchestrator passes it explicitly). Sub-agents also accept the parent's sid via the new `peaks session info --active` primitive when they need a one-shot read.
+
+Note: `peaks request init` is **dry-run by default** — the JSON response has `applied: false` and no file is written unless `--apply` is passed. This is the same safe-by-default pattern as `peaks workspace migrate --apply`. Sub-agents that need to actually create a slice must add `--apply`.
+
 ## Boundaries
 
 Peaks-Cli Solo may:

package/skills/peaks-txt/SKILL.md

@@ -15,6 +15,8 @@ Before any analysis or tool call, immediately run:
 peaks skill presence:set peaks-txt --project <repo> --mode <mode> --gate startup
 ```
 
+**When invoked as a sub-agent (peaks-solo swarm):** do NOT call `peaks skill presence:set` (Solo owns the active-skill marker) and do NOT spawn your own session. Use the parent's sid — read `.peaks/_runtime/session.json` or pass `--session-id <parent-sid>` to any session-creating CLI. The new `peaks session info --active` reads the canonical binding for you.
+
 On the first presence:set in a project, ensure the out-of-band status bar is installed so the user can see at a glance that Peaks is orchestrating — it renders the active skill in Claude Code's terminal status line, independent of model output:
 
 ```bash

package/skills/peaks-ui/SKILL.md

@@ -30,6 +30,7 @@ UI's headed-browser inspection hits the same auth walls. The flow is identical t
 
 When this skill is launched as a sub-agent via `Task(subagent_type="general-purpose", ...)` from `peaks-solo`, the following sections of THIS skill are **suspended** for the sub-agent run:
 
+- **Session id** — use the parent's sid (read `.peaks/_runtime/session.json` or pass `--session-id <parent-sid>` to any session-creating CLI). Do NOT spawn your own session. The new `peaks session info --active` reads the canonical binding for you.
 - **Skill presence (MANDATORY first action)** — do NOT call `peaks skill presence:set peaks-ui`. The sub-agent must not overwrite `.peaks/.active-skill.json`; the main Solo loop owns that file. If you need to mark your own state, write a marker file at `.peaks/<session-id>/system/sub-agent-ui.json` and only that.
 - **Workspace initialization** — Solo has already run `peaks workspace init` before fan-out. Do not re-run it.
 - **Mode selection** — Solo has already chosen the mode.