peaks-cli 1.3.2 → 1.3.4

package/dist/src/services/ide/ide-detector.d.ts

@@ -0,0 +1,10 @@
+import type { IdeId } from './ide-types.js';
+/**
+ * Detect which IDE a given project root is using, by looking for the IDE's
+ * settings directory (`.claude`, `.trae`, etc.). Returns the first match in
+ * adapter insertion order, or `null` if no adapter's directory is present.
+ *
+ * 启发式:基于 cwd 目录存在性。CLI 后续 slice 会扩展为 env 变量检测、settings
+ * 文件内容检测、显式 `--ide` flag 覆盖等。
+ */
+export declare function detectInstalledIde(projectRoot: string): IdeId | null;

package/dist/src/services/ide/ide-detector.js

@@ -0,0 +1,19 @@
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import { listAdapters } from './ide-registry.js';
+/**
+ * Detect which IDE a given project root is using, by looking for the IDE's
+ * settings directory (`.claude`, `.trae`, etc.). Returns the first match in
+ * adapter insertion order, or `null` if no adapter's directory is present.
+ *
+ * 启发式:基于 cwd 目录存在性。CLI 后续 slice 会扩展为 env 变量检测、settings
+ * 文件内容检测、显式 `--ide` flag 覆盖等。
+ */
+export function detectInstalledIde(projectRoot) {
+    for (const adapter of listAdapters()) {
+        if (existsSync(join(projectRoot, adapter.settings.dirName))) {
+            return adapter.id;
+        }
+    }
+    return null;
+}

package/dist/src/services/ide/ide-registry.d.ts

@@ -0,0 +1,14 @@
+import type { IdeAdapter, IdeId } from './ide-types.js';
+/** Get the adapter for a given IDE id. Throws on unsupported IDE. */
+export declare function getAdapter(ide: IdeId): IdeAdapter;
+/** All registered adapter ids (insertion order). */
+export declare function listAdapterIds(): readonly IdeId[];
+/** All registered adapters (insertion order). */
+export declare function listAdapters(): readonly IdeAdapter[];
+/**
+ * Test seam: register or replace an adapter. Used by future slices when adding
+ * a new IDE. Caller is responsible for ensuring the adapter is well-formed.
+ */
+export declare function _setAdapterForTesting(ide: IdeId, adapter: IdeAdapter): void;
+/** Test seam: reset to built-in defaults. */
+export declare function _resetAdaptersForTesting(): void;

package/dist/src/services/ide/ide-registry.js

@@ -0,0 +1,45 @@
+import { CLAUDE_CODE_ADAPTER } from './adapters/claude-code-adapter.js';
+import { TRAE_ADAPTER } from './adapters/trae-adapter.js';
+/**
+ * Built-in IDE adapter registry。Map<IdeId, IdeAdapter> 是单一来源。
+ *
+ * Slice #1 注册 claude-code。
+ * Slice #2 注册 trae —— 这是 slice #1 抽出的 IdeAdapter 形状的
+ * 第一个真实客户,验证"填表"承诺。
+ * 后续 slice 注入 codex / cursor / qoder / tongyi-lingma 时,只需在此
+ * Map 加条目 —— 所有 adapter 使用方(hook-translator、hooks install、statusline
+ * install、mcp apply)通过 `getAdapter(ide)` 拿取,无需修改。
+ */
+const ADAPTERS = new Map([
+    ['claude-code', CLAUDE_CODE_ADAPTER],
+    ['trae', TRAE_ADAPTER],
+]);
+/** Get the adapter for a given IDE id. Throws on unsupported IDE. */
+export function getAdapter(ide) {
+    const adapter = ADAPTERS.get(ide);
+    if (!adapter) {
+        throw new Error(`Unsupported IDE: ${ide}. Registered: ${listAdapterIds().join(', ') || '(none)'}`);
+    }
+    return adapter;
+}
+/** All registered adapter ids (insertion order). */
+export function listAdapterIds() {
+    return Array.from(ADAPTERS.keys());
+}
+/** All registered adapters (insertion order). */
+export function listAdapters() {
+    return Array.from(ADAPTERS.values());
+}
+/**
+ * Test seam: register or replace an adapter. Used by future slices when adding
+ * a new IDE. Caller is responsible for ensuring the adapter is well-formed.
+ */
+export function _setAdapterForTesting(ide, adapter) {
+    ADAPTERS.set(ide, adapter);
+}
+/** Test seam: reset to built-in defaults. */
+export function _resetAdaptersForTesting() {
+    ADAPTERS.clear();
+    ADAPTERS.set('claude-code', CLAUDE_CODE_ADAPTER);
+    ADAPTERS.set('trae', TRAE_ADAPTER);
+}

package/dist/src/services/ide/ide-types.d.ts

@@ -0,0 +1,180 @@
+/**
+ * peaks 自有 hook 协议 + slim IDE adapter 接口。
+ *
+ * peaks-cli 不再适配 IDE 私有的 hook 协议;反之 peaks 定义自己的 canonical
+ * schema,每个 IDE 只需要填 4 字符串 + 1 settings 函数,新 IDE 适配变成"填表"。
+ *
+ * 不可消除的 per-IDE 字段(诚实交代,见 PRD R-1..R-4):
+ *   - settings.json 物理位置
+ *   - 项目根 env 变量名
+ *   - hook 事件名 + matcher 名
+ *
+ * 其他全部归一化到 peaks 内部模型(见 hook-protocol.ts)。
+ */
+import type { SubAgentDispatcher } from '../dispatch/sub-agent-dispatcher.js';
+export type IdeId = 'claude-code' | 'trae' | 'codex' | 'cursor' | 'qoder' | 'tongyi-lingma';
+export interface IdeCapabilities {
+    /** peaks gate enforce 是否适用该 IDE(必备) */
+    readonly gateEnforce: true;
+    /** peaks progress start(sub-agent 派发)是否适用 */
+    readonly progressStart: boolean;
+    /** peaks statusline 状态栏是否适用 */
+    readonly statusline: boolean;
+    /** peaks mcp install 是否适用 */
+    readonly mcpInstall: boolean;
+}
+export interface IdeSettingsLocation {
+    /** 项目根下的 settings 目录名,例如 '.claude' / '.trae' / '.cursor' */
+    readonly dirName: string;
+    /** settings 文件名(部分 IDE 叫 settings.json / mcp.json) */
+    readonly settingsFileName: string;
+    /** 解析出 settings.json 绝对路径 */
+    resolveSettingsFile(scope: 'project' | 'global', projectRoot: string | undefined): string;
+    /** 该 IDE 是否支持此 scope(用于清晰报错) */
+    supportsScope(scope: 'project' | 'global'): boolean;
+}
+/**
+ * Slim IDE adapter 描述。每 IDE 一个静态常量(无需 DI)。
+ * 字段故意保持少:让 adapter 的添加是"填表"而非"重写"。
+ */
+export interface IdeAdapter {
+    readonly id: IdeId;
+    /** 人类可读名,出现在 CLI help / 命令输出 */
+    readonly displayName: string;
+    readonly settings: IdeSettingsLocation;
+    /** IDE 注入的项目根 env 变量名;`peaks gate enforce` 等命令模板会引用此 env */
+    readonly envVar: string;
+    /** settings.json 里 hook 数组的 key,例如 'PreToolUse' / 'beforeToolCall' */
+    readonly hookEvent: string;
+    /** hook 数组元素的 matcher 字段(工具名匹配),例如 'Bash' / 'Task' / 'terminal' */
+    readonly toolMatcher: string;
+    /**
+     * The tool name used by this IDE to invoke a sub-agent (e.g. Claude Code
+     * uses 'Task' to dispatch a sub-agent, Trae may use a different name).
+     * Consumed by the `peaks progress start` hook entry so each IDE self-
+     * reports its sub-agent tool name. Additive on `toolMatcher`: the
+     * `toolMatcher` field still drives the gate-enforce hook entry, this
+     * one drives the sub-agent-progress hook entry.
+     *
+     * Added in slice 2026-06-06-sub-agent-spawn-bug-and-decouple.
+     */
+    readonly subAgentToolMatcher: string;
+    /**
+     * Per-IDE sub-agent dispatcher. The `peaks sub-agent dispatch` CLI reads
+     * this field, calls `supportsRole` + `buildToolCall`, and returns the
+     * resulting tool-call descriptor in the JSON envelope. Additive on
+     * `subAgentToolMatcher`: the matcher still drives the gate-enforce hook
+     * entry; this field drives the runtime sub-agent dispatch surface.
+     *
+     * Added in slice 2026-06-07-sub-agent-dispatch-decouple. See PRD #002
+     * G1 (AC-1, AC-2) + [[slim-ideadapter-shape-is-the-contract]].
+     */
+    readonly subAgentDispatcher: SubAgentDispatcher;
+    /**
+     * Per-IDE opt-in to the G9 prompt-size gate. When `true`, the
+     * `peaks hooks install` command registers the G9 PreToolUse hook
+     * (`peaks sub-agent-dispatch-guard`) for this IDE. When `false`,
+     * the hook is NOT installed (the IDE either doesn't support the
+     * PreToolUse event in a useful form, or the user has opted out).
+     *
+     * The CLI 兜底 layer in `peaks sub-agent dispatch` still enforces
+     * the threshold regardless of this field — `promptSizeAware` only
+     * controls the hook layer (R-15: G9 hook is LLM-platform-specific).
+     *
+     * Added in slice 2026-06-07-sub-agent-context-governance. See PRD
+     * #003 G9.2 + AC-56. Default `false` to preserve slice #009's
+     * `peaks hooks install` output byte-stability.
+     */
+    readonly promptSizeAware: boolean;
+    /** install / uninstall 后展示给用户的提示文本(各 IDE 不同,例如 Claude 提示重启窗口) */
+    readonly installHints: readonly string[];
+    /** 该 IDE 在 peaks 上可启用的能力(用于在不支持的 IDE 上软警告) */
+    readonly capabilities: IdeCapabilities;
+    /**
+     * Where this IDE reads its project-level agent instructions from.
+     * When undefined, the postinstall + `peaks standards init` codepath falls
+     * back to the legacy Claude Code path (CLAUDE.md + .claude/rules/**)
+     * AND emits a stderr warning. Adapters in slice 1.3.2 declare this
+     * value (Claude Code), are annotated UNVERIFIED for future slices
+     * (Trae, slice #012+), or omit it entirely (not-yet-registered IDEs).
+     *
+     * Added in slice 011-2026-06-07-ide-adapter-resource-profile.
+     */
+    readonly standardsProfile?: IdeStandardsProfile;
+    /**
+     * Where `scripts/install-skills.mjs` symlinks the bundled skills +
+     * output styles. When undefined, the postinstall falls back to
+     * `~/.claude/skills` + `~/.claude/output-styles` (legacy) AND emits
+     * a stderr warning. Adapters that opt into the dispatch layer fill
+     * this; adapters that don't (Trae in slice 1.3.2) leave it undefined
+     * and follow the legacy path with a warning.
+     *
+     * Added in slice 011-2026-06-07-ide-adapter-resource-profile.
+     */
+    readonly skillInstall?: IdeSkillInstall;
+}
+/**
+ * Per-IDE standards-file location + format profile. Used by the
+ * `peaks standards init` dispatch layer (slice 011) to write the
+ * project-level standards files at the IDE-specific path, not the
+ * Claude Code hardcoded one. Adapters that omit this field trigger
+ * the legacy Claude Code path with a stderr warning.
+ */
+export interface IdeStandardsProfile {
+    /** Filename for the project-root constitution (e.g. 'CLAUDE.md'), or null if the IDE has no equivalent. */
+    readonly rootFile: string | null;
+    /** Directory for module-level rules (e.g. '.claude/rules'), or null if the IDE has no equivalent. */
+    readonly rulesDir: string | null;
+    /** Glob under rulesDir to enumerate rule files. */
+    readonly rulesFileGlob: string;
+    /** True if the IDE auto-loads these files at session start. */
+    readonly autoLoaded: boolean;
+    /** Output format. markdown = plain text; markdown+frontmatter = adds YAML frontmatter to each rule file. */
+    readonly format: 'markdown' | 'markdown+frontmatter';
+    /** Human-readable hint surfaced in the fallback warning. */
+    readonly migrationHint?: string;
+}
+/**
+ * Per-IDE postinstall target roots. The `scripts/install-skills.mjs`
+ * script consumes this to symlink the bundled skills + output styles
+ * to the IDE-specific install location, with back-compat for the
+ * legacy `PEAKS_CLAUDE_SKILLS_DIR` / `PEAKS_CLAUDE_OUTPUT_STYLES_DIR`
+ * env vars (precedence: explicit option > env var > IDE profile > legacy default).
+ */
+export interface IdeSkillInstall {
+    /** Absolute path under which the postinstall script symlinks the bundled `skills/` directory. */
+    readonly skillsDir: string;
+    /** Absolute path under which the postinstall script writes the bundled `output-styles/`. Null if the IDE has no equivalent. */
+    readonly outputStylesDir: string | null;
+    /** Symlink strategy. */
+    readonly installStrategy: 'symlink' | 'copy';
+    /** Back-compat env var name (e.g. PEAKS_CLAUDE_SKILLS_DIR). Null if no env var is supported. */
+    readonly envVarOverride: string | null;
+}
+/** peaks canonical hook schema 版本标识 */
+export declare const PEAKS_HOOK_SCHEMA: "peaks-hook/v1";
+/** peaks canonical hook 形态 —— 单一协议,所有 IDE 经 hook-translator 归一化到此 */
+export interface PeaksCanonicalHook {
+    readonly schema: typeof PEAKS_HOOK_SCHEMA;
+    readonly event: 'pre-tool-use' | 'post-tool-use' | 'sub-agent-start';
+    readonly toolName: string;
+    readonly toolInput: Record<string, unknown>;
+    /** 解析自 env 变量或 --project 的项目根 */
+    readonly projectRoot: string;
+    /** 选输出格式 */
+    readonly rawIdeFormat: IdeId;
+    /** 原始 stdin,留作回退 */
+    readonly rawPayload: unknown;
+}
+/** peaks 决策发回形态枚举(按 IDE 期望的"发回"形式) */
+export type PeaksDecisionTransport = {
+    kind: 'stdout-json';
+    denyShape: Record<string, unknown>;
+} | {
+    kind: 'exit-code';
+    denyCode: number;
+} | {
+    kind: 'both';
+    denyShape: Record<string, unknown>;
+    denyCode: number;
+};

package/dist/src/services/ide/ide-types.js

@@ -0,0 +1,2 @@
+/** peaks canonical hook schema 版本标识 */
+export const PEAKS_HOOK_SCHEMA = 'peaks-hook/v1';

package/dist/src/services/ide/resource-profile.d.ts

@@ -0,0 +1,52 @@
+/**
+ * Resource profile accessors for the per-IDE dispatch layer.
+ *
+ * Slice #011-2026-06-07-ide-adapter-resource-profile introduced two new
+ * optional fields on the `IdeAdapter` interface:
+ *
+ *   - `standardsProfile` — where the IDE reads its project-level
+ *     agent instructions (root file + rules directory + format).
+ *   - `skillInstall`     — where the postinstall script symlinks the
+ *     bundled skills + output styles.
+ *
+ * These accessors are the single chokepoint for "given an IdeId, where
+ * does the IDE read X from?". The two consumers that consume them:
+ *
+ *   1. `src/services/standards/ide-aware-standards-service.ts` —
+ *      wraps `peaks standards init/update` to dispatch on the detected
+ *      IDE rather than always writing CLAUDE.md + .claude/rules/**.
+ *   2. `scripts/install-skills.mjs` (loaded via dynamic import) — the
+ *      postinstall script dispatches on detected IDEs to install
+ *      skills at the IDE-specific target root.
+ *
+ * Future slices add Cursor / Codex / Qoder / Tongyi Lingma by filling
+ * the per-IDE values on the adapter; the accessors and the dispatch
+ * layer do not change.
+ */
+import type { IdeId, IdeSkillInstall, IdeStandardsProfile } from './ide-types.js';
+/** Result of `detectAllResourceTargets` — one entry per registered adapter. */
+export interface ResourceTarget {
+    readonly ideId: IdeId;
+    readonly standardsProfile: IdeStandardsProfile | null;
+    readonly skillInstall: IdeSkillInstall | null;
+}
+/**
+ * Look up the standards-file profile for a given IDE. Returns `null`
+ * if the adapter is registered but does not declare a standards profile
+ * (Trae in slice #011 — annotated `Standards: UNVERIFIED` for slice #012+).
+ * Throws if the IDE id is not registered at all.
+ */
+export declare function getStandardsProfile(ideId: IdeId): IdeStandardsProfile | null;
+/**
+ * Look up the skill-install profile for a given IDE. Returns `null`
+ * if the adapter does not declare one (Trae in slice #011). Throws
+ * if the IDE id is not registered.
+ */
+export declare function getSkillInstall(ideId: IdeId): IdeSkillInstall | null;
+/**
+ * Enumerate all registered adapters and return their resource profiles.
+ * Used by `install-skills.mjs` (and any future fan-out consumer) that
+ * needs to install across multiple IDEs at once. Returns the profiles
+ * in adapter insertion order.
+ */
+export declare function detectAllResourceTargets(): readonly ResourceTarget[];

package/dist/src/services/ide/resource-profile.js

@@ -0,0 +1,33 @@
+import { getAdapter, listAdapterIds } from './ide-registry.js';
+/**
+ * Look up the standards-file profile for a given IDE. Returns `null`
+ * if the adapter is registered but does not declare a standards profile
+ * (Trae in slice #011 — annotated `Standards: UNVERIFIED` for slice #012+).
+ * Throws if the IDE id is not registered at all.
+ */
+export function getStandardsProfile(ideId) {
+    const adapter = getAdapter(ideId);
+    return adapter.standardsProfile ?? null;
+}
+/**
+ * Look up the skill-install profile for a given IDE. Returns `null`
+ * if the adapter does not declare one (Trae in slice #011). Throws
+ * if the IDE id is not registered.
+ */
+export function getSkillInstall(ideId) {
+    const adapter = getAdapter(ideId);
+    return adapter.skillInstall ?? null;
+}
+/**
+ * Enumerate all registered adapters and return their resource profiles.
+ * Used by `install-skills.mjs` (and any future fan-out consumer) that
+ * needs to install across multiple IDEs at once. Returns the profiles
+ * in adapter insertion order.
+ */
+export function detectAllResourceTargets() {
+    return listAdapterIds().map((ideId) => ({
+        ideId,
+        standardsProfile: getStandardsProfile(ideId),
+        skillInstall: getSkillInstall(ideId),
+    }));
+}

package/dist/src/services/ide/shared/atomic-json.d.ts

@@ -0,0 +1,15 @@
+export declare const ATOMIC_JSON_FILE_MODE = 384;
+/**
+ * Read a JSON object file using a no-follow open. Returns an empty object when
+ * the file does not exist or is empty. Throws when the file exists but does not
+ * contain a JSON object (so callers can distinguish "no settings" from
+ * "malformed settings").
+ */
+export declare function readJsonObjectFile<T extends Record<string, unknown> = Record<string, unknown>>(filePath: string): T;
+/**
+ * Atomically write a JSON file: create a unique temp file in the same
+ * directory, fsync its contents via close, then `rename` over the target. A
+ * failure during rename removes the temp file (best effort). The target is
+ * created with 0o600 permissions.
+ */
+export declare function atomicWriteJson(filePath: string, value: unknown): void;

package/dist/src/services/ide/shared/atomic-json.js

@@ -0,0 +1,58 @@
+import { closeSync, constants, existsSync, mkdirSync, openSync, readFileSync, renameSync, unlinkSync, writeFileSync } from 'node:fs';
+import { randomUUID } from 'node:crypto';
+import { dirname, join } from 'node:path';
+export const ATOMIC_JSON_FILE_MODE = 0o600;
+/**
+ * Read a JSON object file using a no-follow open. Returns an empty object when
+ * the file does not exist or is empty. Throws when the file exists but does not
+ * contain a JSON object (so callers can distinguish "no settings" from
+ * "malformed settings").
+ */
+export function readJsonObjectFile(filePath) {
+    if (!existsSync(filePath))
+        return {};
+    const fd = openSync(filePath, constants.O_RDONLY | constants.O_NOFOLLOW);
+    try {
+        const raw = readFileSync(fd, 'utf8').trim();
+        if (raw.length === 0)
+            return {};
+        const parsed = JSON.parse(raw);
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+            throw new Error('settings file must contain a JSON object');
+        }
+        return parsed;
+    }
+    finally {
+        closeSync(fd);
+    }
+}
+/**
+ * Atomically write a JSON file: create a unique temp file in the same
+ * directory, fsync its contents via close, then `rename` over the target. A
+ * failure during rename removes the temp file (best effort). The target is
+ * created with 0o600 permissions.
+ */
+export function atomicWriteJson(filePath, value) {
+    const dir = dirname(filePath);
+    mkdirSync(dir, { recursive: true });
+    const tempPath = join(dir, `.settings.${randomUUID()}.tmp`);
+    const fd = openSync(tempPath, constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | constants.O_NOFOLLOW, ATOMIC_JSON_FILE_MODE);
+    try {
+        writeFileSync(fd, `${JSON.stringify(value, null, 2)}\n`, 'utf8');
+    }
+    finally {
+        closeSync(fd);
+    }
+    try {
+        renameSync(tempPath, filePath);
+    }
+    catch (error) {
+        try {
+            unlinkSync(tempPath);
+        }
+        catch {
+            // best effort cleanup
+        }
+        throw error;
+    }
+}

package/dist/src/services/ide/shared/safe-path.d.ts

@@ -0,0 +1,11 @@
+export type HookScope = 'project' | 'global';
+/** True iff `childPath` resolves to `parentPath` or any path nested inside it. */
+export declare function isInsidePath(childPath: string, parentPath: string): boolean;
+/**
+ * Reject settings targets that are symlinked or escape the configured root.
+ * Used by the hook / statusline / MCP install paths to keep the project root the
+ * sole owner of writable settings files.
+ */
+export declare function assertSafeSettingsFile(scope: HookScope, root: string, dirName: string, settingsFileName: string): {
+    settingsPath: string;
+};

package/dist/src/services/ide/shared/safe-path.js

@@ -0,0 +1,29 @@
+import { existsSync, lstatSync, realpathSync } from 'node:fs';
+import { isAbsolute, join, relative } from 'node:path';
+/** True iff `childPath` resolves to `parentPath` or any path nested inside it. */
+export function isInsidePath(childPath, parentPath) {
+    const rel = relative(parentPath, childPath);
+    return rel === '' || (!rel.startsWith('..') && !isAbsolute(rel));
+}
+/**
+ * Reject settings targets that are symlinked or escape the configured root.
+ * Used by the hook / statusline / MCP install paths to keep the project root the
+ * sole owner of writable settings files.
+ */
+export function assertSafeSettingsFile(scope, root, dirName, settingsFileName) {
+    const settingsPath = join(root, dirName, settingsFileName);
+    const dirPath = join(root, dirName);
+    if (existsSync(dirPath) && lstatSync(dirPath).isSymbolicLink()) {
+        throw new Error(`${dirName} directory must not be a symlink`);
+    }
+    if (existsSync(settingsPath)) {
+        if (lstatSync(settingsPath).isSymbolicLink()) {
+            throw new Error(`${settingsFileName} must not be a symlink`);
+        }
+        const realRoot = realpathSync(root);
+        if (!isInsidePath(realpathSync(settingsPath), realRoot)) {
+            throw new Error(`${settingsFileName} must stay inside the ${scope} root`);
+        }
+    }
+    return { settingsPath };
+}

package/dist/src/services/memory/project-context-service.js

@@ -1,6 +1,7 @@
 import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { listSessionMetas } from '../session/session-manager.js';
+import { getSessionDir } from '../session/getSessionDir.js';
 const PROJECT_CONTEXT_FILE = '.peaks/PROJECT.md';
 const CONTEXT_HEADER = `# Peaks Project Context
 
@@ -89,7 +90,7 @@ function buildSessionHistory(projectRoot) {
         const title = (meta.title ?? 'Untitled').slice(0, 40);
         const skill = meta.skill ?? '-';
         // Extract one-line summary from artifacts for the "What" column
-        const sessionRoot = join(projectRoot, '.peaks', meta.sessionId);
+        const sessionRoot = getSessionDir(projectRoot, meta.sessionId);
         const summary = extractOneLineSummary(sessionRoot);
         const brief = summary ? summary.slice(0, 70) : skill;
         body += `| ${date} | \`${dir}\` | ${title} | ${brief} |\n`;

package/dist/src/services/memory/project-memory-service.js

@@ -2,6 +2,7 @@ import { closeSync, constants, copyFileSync, existsSync, lstatSync, mkdirSync, o
 import { dirname, basename, isAbsolute, join, relative, resolve } from 'node:path';
 import { isInsidePath, isWindowsAbsolutePath, normalizePath, resolveInputPath, stablePath, stableRealPath } from '../../shared/path-utils.js';
 import { containsSensitiveConfigValue, isSensitiveConfigPath } from '../config/config-service.js';
+import { getSessionDir } from '../session/getSessionDir.js';
 // Hot kinds: full body kept in index for always-available context
 const HOT_KINDS = new Set(['feedback', 'decision', 'rule', 'convention', 'module', 'lesson']);
 // ---------------------------------------------------------------------------
@@ -237,13 +238,13 @@ function summarizeMemoryBody(body) {
 function assertSafeSessionDir(projectRoot, sessionId) {
     const normalizedRoot = normalizeRoot(projectRoot);
     const realRoot = normalizeRealRoot(projectRoot);
-    const sessionDir = join(normalizedRoot, '.peaks', sessionId);
+    const sessionDir = getSessionDir(normalizedRoot, sessionId);
     if (!existsSync(sessionDir)) {
         // Distinguish "not found" (caller will treat as no-op) from "escapes project
         // root" (caller must surface a hard error). We probe by checking whether the
         // joined path, after realpath, would still be inside the project root.
-        if (isAbsolute(join(normalizedRoot, '.peaks', sessionId))) {
-            const realJoined = safeRealpath(join(normalizedRoot, '.peaks', sessionId));
+        if (isAbsolute(getSessionDir(normalizedRoot, sessionId))) {
+            const realJoined = safeRealpath(getSessionDir(normalizedRoot, sessionId));
             if (realJoined && !isInsidePath(realJoined, realRoot)) {
                 throw new Error('Session directory must stay inside the project root');
             }

package/dist/src/services/perf/perf-baseline-service.js

@@ -39,6 +39,7 @@ import { mkdir, writeFile } from 'node:fs/promises';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { getSessionId } from '../session/session-manager.js';
+import { getSessionDir } from '../session/getSessionDir.js';
 import { findProjectRoot } from '../config/config-safety.js';
 const README_BODY = `# Performance baseline
 
@@ -117,7 +118,7 @@ function renderBaselineTemplate() {
 function buildPlan(projectRoot, apply) {
     const sessionId = getSessionId(projectRoot);
     const sessionRoot = sessionId !== null
-        ? join(projectRoot, '.peaks', sessionId)
+        ? getSessionDir(projectRoot, sessionId)
         : null;
     const perfBaselinePath = sessionRoot !== null
         ? join(sessionRoot, 'rd', 'perf-baseline.md')

package/dist/src/services/progress/progress-service.d.ts

@@ -2,7 +2,7 @@
  * Sub-agent progress surfacing for the RD/QA sub-agents in
  * `peaks-solo`'s Swarm phase. A sub-agent (or the LLM via the
  * `peaks progress step` CLI) writes a stable JSON file at
- * `.peaks/<sid>/system/subagent-progress.json`. The user-side
+ * `.peaks/_sub_agents/<sid>/subagent-progress.json`. The user-side
  * `peaks progress watch` CLI polls this file in a separate
  * terminal tab and renders elapsed / spinner / sub-step. The
  * `peaks progress start` CLI auto-spawns the watch in a new

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

@@ -2,7 +2,7 @@
  * Sub-agent progress surfacing for the RD/QA sub-agents in
  * `peaks-solo`'s Swarm phase. A sub-agent (or the LLM via the
  * `peaks progress step` CLI) writes a stable JSON file at
- * `.peaks/<sid>/system/subagent-progress.json`. The user-side
+ * `.peaks/_sub_agents/<sid>/subagent-progress.json`. The user-side
  * `peaks progress watch` CLI polls this file in a separate
  * terminal tab and renders elapsed / spinner / sub-step. The
  * `peaks progress start` CLI auto-spawns the watch in a new
@@ -34,20 +34,24 @@ import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from '
 import { dirname, join, resolve } from 'node:path';
 import { getSessionIdCanonical } from '../session/session-manager.js';
 import { findProjectRoot } from '../config/config-safety.js';
-const PROGRESS_REL_PATH = 'system/subagent-progress.json';
-const SPAWN_REL_PATH = 'system/progress-spawn.json';
+// As of slice 2026-06-06-sub-agent-spawn-bug-and-decouple, the per-session
+// sub-agent state files live under `.peaks/_sub_agents/<sid>/`, NOT under
+// `.peaks/<sid>/system/`. The new path mirrors the existing `_runtime/`
+// and `_dogfood/` convention (leading underscore = meta-classification, not
+// a per-session artifact). The previous `<sid>/system/...` locations are
+// migrated to the new path on first run of `peaks workspace reconcile
+// --apply` (see `migrateSubAgentState` in reconcile-service.ts).
+const SUB_AGENTS_DIR = '_sub_agents';
+const PROGRESS_FILE_NAME = 'subagent-progress.json';
+const SPAWN_FILE_NAME = 'progress-spawn.json';
 function progressPath(projectRoot) {
-    // The progress file lives under the *session* directory, not
-    // directly under .peaks/. Every other per-slice artefact
-    // (rd/tech-doc.md, qa/test-cases/<rid>.md, prd/requests/<rid>.md,
-    // memory/, openspec/) lives under .peaks/<sid>/, so progress
-    // should too. Without the session prefix, a session rotation
-    // would orphan the file in the project root, and switching
-    // sessions would have the watch reading the wrong slice's
-    // progress.
+    // The progress file lives at `.peaks/_sub_agents/<sid>/subagent-progress.json`.
+    // The leading `_sub_agents/` is a meta-classification (mirrors `_runtime/`,
+    // `_dogfood/`) — the SID is the per-session discriminator inside that meta
+    // dir. Without the SID, sessions would collide on the same file.
     const sessionId = getSessionIdCanonical(projectRoot);
     const subDir = sessionId ?? 'unbound';
-    return join(projectRoot, '.peaks', subDir, PROGRESS_REL_PATH);
+    return join(projectRoot, '.peaks', SUB_AGENTS_DIR, subDir, PROGRESS_FILE_NAME);
 }
 function ensureParentDir(path) {
     const dir = dirname(path);
@@ -199,12 +203,12 @@ export function subAgentProgressPath(projectRoot) {
 export function subAgentSpawnPath(projectRoot) {
     const sessionId = getSessionIdCanonical(projectRoot);
     const subDir = sessionId ?? 'unbound';
-    return join(projectRoot, '.peaks', subDir, SPAWN_REL_PATH);
+    return join(projectRoot, '.peaks', SUB_AGENTS_DIR, subDir, SPAWN_FILE_NAME);
 }
 function spawnRecordPath(projectRoot) {
     const sessionId = getSessionIdCanonical(projectRoot);
     const subDir = sessionId ?? 'unbound';
-    return join(projectRoot, '.peaks', subDir, SPAWN_REL_PATH);
+    return join(projectRoot, '.peaks', SUB_AGENTS_DIR, subDir, SPAWN_FILE_NAME);
 }
 export function writeSpawnRecord(options) {
     const sessionId = getSessionIdCanonical(options.projectRoot);

package/dist/src/services/security/safe-settings-path.d.ts

@@ -0,0 +1,12 @@
+/** Build the canonical record path for a given session/rid/timestamp. */
+export declare function dispatchRecordPath(projectRoot: string, sid: string, rid: string, ts?: Date): string;
+/** The directory under which dispatch records live. */
+export declare function dispatchRecordsDir(projectRoot: string, sid: string): string;
+/**
+ * Assert that `recordPath` lives under `projectRoot/.peaks/_sub_agents/<sid>/`.
+ * Rejects symlink/junction escapes and `..` segments.
+ *
+ * Throws an Error with `.code = 'INVALID_RECORD_PATH'` on rejection so
+ * the CLI can map to `{ok: false, code: "INVALID_RECORD_PATH"}`.
+ */
+export declare function assertSafeDispatchRecordPath(recordPath: string, projectRoot: string): string;