pi-legion 2.0.2 → 2.0.3

package/CHANGELOG.md

@@ -11,6 +11,18 @@ summary so you can see **2.x vs 0.16** without leaving the tree.
 
 ## [Unreleased]
 
+## [2.0.3] — 2026-10-15
+
+### Fixed
+
+- `maxChildrenPerNode` only counts **live/running** children; `retire` (including
+  Already-retired no-op) frees the budget slot so a full tree can launch again
+  after retire. Session keep for resume does **not** occupy the concurrent slot
+  (#142 / #143).
+- Header tok/s uses `MIN_RATE_GENERATION_MS=1000` (same floor as tree rows): when
+  the in-window generation delta is under 1s, fall back to wall-clock so tiny
+  `dGen` cannot explode rates into the millions (#140 / #141).
+
 ## [2.0.2] — 2026-10-16
 
 ### Fixed
@@ -131,6 +143,9 @@ branch — pin `pi-legion@0.16.x` if you still need that model. See
 Earlier 0.11–0.15 history (including the `pi-herdr-swarm` /
 `@zzjcool/pi-herdr-subagents` renames) lives in git tags and older Releases.
 
-[Unreleased]: https://github.com/zzjcool/pi-legion/compare/v2.0.0...HEAD
+[Unreleased]: https://github.com/zzjcool/pi-legion/compare/v2.0.3...HEAD
+[2.0.3]: https://github.com/zzjcool/pi-legion/compare/v2.0.2...v2.0.3
+[2.0.2]: https://github.com/zzjcool/pi-legion/compare/v2.0.1...v2.0.2
+[2.0.1]: https://github.com/zzjcool/pi-legion/compare/v2.0.0...v2.0.1
 [2.0.0]: https://github.com/zzjcool/pi-legion/releases/tag/v2.0.0
 [0.16.x]: https://github.com/zzjcool/pi-legion/releases

package/docs/legion-v2-contract.md

@@ -359,7 +359,7 @@ interface LegionEventBus {
 | 项 | 默认 | 判定 |
 |---|---|---|
 | `maxDepth`（全树深度） | 4 | 硬顶 = `MAX_NESTED_PATH_ENTRIES`（血缘路径在 4 处饱和；settings/env 超 4 截断——告警在 M1-integration 的 launch 路径接入，M0 阶段截断静默可接受）。每进程生效上限 C：根 `C = min(env 运营者覆盖, settings.legion.maxDepth, 4)`；深度 d、上限 C 的父 launch 角色 R：先过闸门 `d+1 > C` → BUDGET_EXCEEDED；再经 `PI_SUBAGENT_MAX_DEPTH` 下发 `C子 = min(C, d + R, 4)`（R 缺省=不收紧；非法值按叶子 R=1 处理；语义 = 子树代数含自身，位置无关，只收紧不放宽）。不变量：C子 ≤ C父，且每进程 depth ≤ maxDepth |
-| `maxChildrenPerNode`（单节点扇出） | 8 | 父 supervisor 查自己子节点数 |
+| `maxChildrenPerNode`（单节点扇出） | 8 | 父 supervisor 查自己 **live** 子节点数（`starting`/`running`/`blocked`；`settled`/`failed`/`retired` 不占槽，session 可保留 resume） |
 | `maxActiveNodes`（全树并发 running+starting） | 30 | **全树真闸门**（替代只当 hint 的 maxConcurrentAgents）：launch 前一条 SQL，超限 BUDGET_EXCEEDED + `budget_refused` 事件 |
 
 ### 11.2 心跳与孤儿：postman 循环每次刷新直接子节点 `updated_at`。根 supervisor 每 60s 扫描：非终态 + `updated_at` 超 90s = `orphan_detected` 事件 + mail 通知 CEO。恢复 = resume 链（CEO 裁决，auto-resume 默认关）。孤儿判定可判定化：**非终态 ∧ 无活跃进程 ∧ 心跳超时**。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-legion",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Pi Legion v2: recursive centurion trees on headless Pi RPC; shared SQLite WAL legion.db. Four-stage planning/implementing/reviewing/verifying state machine, parent/child/sibling legion_mail, three-layer /legion UI, upward MR trees, squad resume.",
   "type": "module",
   "license": "MIT",

package/src/legion/budget.ts

@@ -1,4 +1,5 @@
 import type { DatabaseSync } from "./db.ts";
+import { LIVE_CHILD_STATUSES } from "./nodes.ts";
 import { withTransaction } from "./db.ts";
 import { appendEvent } from "./events.ts";
 
@@ -64,14 +65,15 @@ export function checkLaunchBudget(
 ): BudgetDecision {
 	validateRequest(request);
 	const limits = normalizeLimits(options.limits);
+	const liveStatuses = LIVE_CHILD_STATUSES.map(() => "?").join(", ");
 	const row = db
 		.prepare(
 			`SELECT
-				(SELECT COUNT(*) FROM nodes WHERE parent_id IS ?) AS child_count,
+				(SELECT COUNT(*) FROM nodes WHERE parent_id IS ? AND status IN (${liveStatuses})) AS child_count,
 				(SELECT COUNT(*) FROM nodes WHERE status IN ('running', 'starting')) AS active_count,
 				CASE WHEN ? IS NULL THEN 1 ELSE EXISTS(SELECT 1 FROM nodes WHERE id = ?) END AS parent_exists`,
 		)
-		.get(request.parentId, request.parentId, request.parentId);
+		.get(request.parentId, ...LIVE_CHILD_STATUSES, request.parentId, request.parentId);
 	const counts = {
 		children: Number(row?.child_count ?? 0),
 		activeNodes: Number(row?.active_count ?? 0),
@@ -86,7 +88,7 @@ export function checkLaunchBudget(
 	if (counts.children >= limits.maxChildrenPerNode) {
 		return denied(
 			"max_children_per_node",
-			`parent already has ${counts.children} children; maxChildrenPerNode is ${limits.maxChildrenPerNode}`,
+			`parent already has ${counts.children} live children; maxChildrenPerNode is ${limits.maxChildrenPerNode}`,
 			base,
 		);
 	}

package/src/legion/nodes.ts

@@ -21,6 +21,13 @@ export const NON_TERMINAL_NODE_STATUSES = [
 	"retired",
 ] as const satisfies readonly NodeStatus[];
 
+/** Statuses that occupy a maxChildrenPerNode concurrency slot (not retired/session-only). */
+export const LIVE_CHILD_STATUSES = [
+	"starting",
+	"running",
+	"blocked",
+] as const satisfies readonly NodeStatus[];
+
 export interface LegionNode {
 	id: string;
 	parentId: string | null;

package/src/runs/orchestrator.ts

@@ -18,7 +18,7 @@ import type { RunStore } from "./store.ts";
 import type { LegionEventBus, LegionProcessEventType } from "../extension/event-bus.ts";
 import { appendEvent } from "../legion/events.ts";
 import { withLaunchBudget, type LegionBudgetLimits } from "../legion/budget.ts";
-import { getChildByName, getNode, insertNode, nodeIdForChild, sanitizeNodeSlug, type LegionNode, updateNode } from "../legion/nodes.ts";
+import { getChildByName, getNode, insertNode, nodeIdForChild, sanitizeNodeSlug, type LegionNode, updateNode, LIVE_CHILD_STATUSES } from "../legion/nodes.ts";
 import { upsertUsage } from "../legion/usage.ts";
 import { evaluatePhaseTransition, isLegionPhase, isTerminalPhase } from "../legion/state-machine.ts";
 import { CHILD_ACCEPTANCE_ROLE_ENV, CHILD_ROLE_ENV } from "../extension/child-guard.ts";
@@ -341,7 +341,8 @@ export class Orchestrator {
 		const depthCeiling = input.utility
 			? parent.depth + 1
 			: Math.min(legion.settings?.maxDepth ?? this.maxDepthValue, MAX_NESTED_PATH_ENTRIES);
-		const childCount = Number(legion.db.prepare("SELECT COUNT(*) AS count FROM nodes WHERE parent_id = ?").get(legion.nodeId)?.count ?? 0);
+		const liveStatuses = LIVE_CHILD_STATUSES.map(() => "?").join(", ");
+		const childCount = Number(legion.db.prepare(`SELECT COUNT(*) AS count FROM nodes WHERE parent_id = ? AND status IN (${liveStatuses})`).get(legion.nodeId, ...LIVE_CHILD_STATUSES)?.count ?? 0);
 		const maxChildren = previous ? Math.max(legion.settings?.maxChildrenPerNode ?? 8, childCount + 1) : legion.settings?.maxChildrenPerNode;
 		const activeReservation = previous && (previous.status === "starting" || previous.status === "running") ? 1 : 0;
 		const limits: LegionBudgetLimits = { maxDepth: depthCeiling, maxChildrenPerNode: maxChildren, maxActiveNodes: (legion.settings?.maxActiveNodes ?? 30) + activeReservation };