@oldflag2333333/pi-subagent 0.1.1 → 0.1.2

package/README.md

@@ -8,7 +8,7 @@ A **profile** defines a specialist's instructions, tools, and optional skills or
 
 ## Install
 
-You need **Node.js 22.19+**, **[Pi](https://pi.dev) 1.0.4+**, and **Herdr**. To launch specialists, run Pi inside a Herdr workspace with the `herdr` command available.
+You need **Node.js 22.19+**, **[Pi](https://pi.dev) 1.2.0+**, and **Herdr**. To launch specialists, run Pi inside a Herdr workspace with the `herdr` command available.
 
 ```bash
 pi install npm:@oldflag2333333/pi-subagent
@@ -157,7 +157,7 @@ Close any orphaned Sub tabs before cleaning; the command only deletes files. Pro
 
 ## Things to know
 
-Messages use custom inbox cards. An idle receiver also gets a short user-role wake prompt to preserve its profile instructions. See [messaging behavior and the Pi wake workaround](docs/messaging.md).
+Messages use custom inbox cards and Pi’s native run preparation, without extra user-role wake messages. See [messaging behavior](docs/messaging.md).
 
 - **Herdr is required for Subs.** There is no headless fallback. Up to four Subs can be open at once, and Subs cannot delegate further.
 - **Profiles are not a sandbox.** Subs run as your OS user. A read-only role is not a filesystem permission boundary.

package/README.zh-CN.md

@@ -8,7 +8,7 @@
 
 ## 安装
 
-需要 **Node.js 22.19+**、**[Pi](https://pi.dev) 1.0.4+** 和 **Herdr**。启动助手时，Pi 必须运行在 Herdr 工作区中，并且能调用 `herdr` 命令。
+需要 **Node.js 22.19+**、**[Pi](https://pi.dev) 1.2.0+** 和 **Herdr**。启动助手时，Pi 必须运行在 Herdr 工作区中，并且能调用 `herdr` 命令。
 
 ```bash
 pi install npm:@oldflag2333333/pi-subagent
@@ -157,7 +157,7 @@ reviewer/
 
 ## 使用须知
 
-助手间消息保留自定义收件卡片。接收方空闲时，会额外出现一条简短的用户角色唤醒消息，以确保角色指令正常加载。详见[消息机制与 Pi 唤醒问题的绕过方案](docs/messaging.md)。
+助手间消息使用自定义收件卡片，由 Pi 原生处理启动准备，不再添加用户角色唤醒消息。详见[消息机制](docs/messaging.md)。
 
 - **子助手依赖 Herdr。** 不支持无界面后台运行；最多同时打开四个子助手，子助手不能继续委派。
 - **角色配置不是沙箱。** 子助手以你的系统用户身份运行，配置“只读角色”不等于限制文件系统权限。

package/docs/messaging.md

@@ -1,28 +1,17 @@
 # Message delivery and rendering
 
-Main ↔ Sub messages remain custom inbox cards. Delivery uses the same `parentWake` wrapper in both directions:
+Pi Subagent requires **Pi 1.2.0 or newer**. Main ↔ Sub messages use `pi.sendMessage()` with `deliverAs: "followUp"` and `triggerTurn: true` in both directions:
 
-- **Busy receiver:** `pi.sendMessage()` with `deliverAs: "followUp"` and `triggerTurn: true`, using Pi's native queue.
-- **Idle receiver:** append the card with `pi.sendMessage(..., { triggerTurn: false })`, then start the run with a short, fixed `pi.sendUserMessage(..., { deliverAs: "steer" })` prompt. This goes through normal input preparation and `before_agent_start`.
+- **Busy receiver:** Pi queues the custom message behind its current work.
+- **Idle receiver:** Pi prepares and starts the run, including `before_agent_start`, the tool loadout, and prompt sections. The event has `messageType: "custom"`, with the starting `message` rather than a user `prompt`.
 
-The wake is a real, visible user-role message added by the extension, not a duplicate of the peer's message. It only asks the receiving agent to process its inbox within its existing task and authority. Peer text stays in the custom card and is never submitted as executable slash-command input.
+There are no synthetic user-role wake messages, version fallbacks, or patches to Pi internals. Custom messages do not pass through user-input processing or execute peer text as slash commands or templates.
 
 ## Delivery guarantees
 
 - `content` carries the peer message and routing instructions; `details` carries rendering and receipt metadata and is not sent to the model.
 - Custom cards retain their title, collapsed/expanded rendering, and saved-session rendering.
-- A message file is removed only after its receipt appears in the receiving session. Legacy user-message receipts remain recognized.
-- An idle burst shares one wake while that wake is starting. Reservations survive `/reload`, are scoped to the receiving session, and clear on `agent_start` or non-reload shutdown.
-- If a wake never starts, a later idle delivery can request another wake after ten seconds. The deadline does not create a timer or promise autonomous retry after an input hook handles the wake.
-- A synchronous wake failure keeps the message file retryable; retrying does not append the custom card again. Pi's fire-and-forget extension API does not expose asynchronous prompt failures as delivery receipts.
+- A message file is removed only after its receipt appears in the receiving session. Existing user-message receipts remain recognized to avoid redelivery of saved messages; this is data compatibility, not support for older Pi runtimes.
+- In-flight message IDs prevent duplicate submission. Synchronous submission failures leave the file retryable. Pi owns run preparation and queueing; the plugin does not keep a separate wake reservation or retry timer.
 
-## Why the workaround exists
-
-Pi 1.0.4 and 1.1.0 have an idle custom-message wake path that bypasses `before_agent_start` and can drop profile prompt sections:
-
-- [#5581: custom-message starts bypass run preparation](https://github.com/earendil-works/pi/issues/5581)
-- [#10267: contributed prompt sections are dropped](https://github.com/earendil-works/pi/issues/10267)
-
-The implementation adapts [nicobailon/pi-subagents' parentWake](https://github.com/nicobailon/pi-subagents/blob/0c33ec7cb26ed1db270d72e746c3c975be880aeb/src/shared/parent-wake.ts), with retries for synchronous wake failures. Attribution and the MIT license are in [third-party notices](third-party-notices.md).
-
-Real Pi SDK tests cover the first idle wake, subsequent turns, busy follow-ups, and reload. The previous upstream TODO is now a required passing regression test. This workaround does not patch Pi internals or claim to fix unrelated retry/resume paths in Pi itself.
+Pi 1.2.0 includes the native custom-message preparation fix in [#10739](https://github.com/earendil-works/pi/pull/10739), resolving [#5581](https://github.com/earendil-works/pi/issues/5581) and [#10267](https://github.com/earendil-works/pi/issues/10267). Real SDK regression tests require profile sections to remain present on the first idle delivery, subsequent turns, busy follow-ups, and after reload. No upstream TODO or workaround is retained.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oldflag2333333/pi-subagent",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Reusable specialist profiles and independent sub-agents for Pi",
   "type": "module",
   "license": "MIT",
@@ -45,15 +45,15 @@
   "peerDependencies": {
     "@earendil-works/pi-agent-core": "*",
     "@earendil-works/pi-ai": "*",
-    "@earendil-works/pi-coding-agent": ">=1.0.4",
+    "@earendil-works/pi-coding-agent": ">=1.2.0",
     "@earendil-works/pi-tui": "*",
     "typebox": "*"
   },
   "devDependencies": {
-    "@earendil-works/pi-agent-core": "^1.0.4",
-    "@earendil-works/pi-ai": "^1.0.4",
-    "@earendil-works/pi-coding-agent": "^1.0.4",
-    "@earendil-works/pi-tui": "^1.0.4",
+    "@earendil-works/pi-agent-core": "^1.2.0",
+    "@earendil-works/pi-ai": "^1.2.0",
+    "@earendil-works/pi-coding-agent": "^1.2.0",
+    "@earendil-works/pi-tui": "^1.2.0",
     "@types/node": "^22.15.0",
     "@types/semver": "^7.8.0",
     "semver": "^7.8.5",

package/src/inbox-state.ts

@@ -2,7 +2,6 @@ import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-a
 import { MESSAGE_TYPE, type TalkDirection } from "./channel.js";
 import type { DelegateManifest, TalkMessage } from "./types.js";
 import { readTalkReceipt } from "./talk-message.js";
-import { parentWakeFor } from "./parent-wake.js";
 
 type ReadonlySessionManager = ExtensionContext["sessionManager"];
 interface PendingTalk {
@@ -69,7 +68,6 @@ export function bindInboxEvents(pi: ExtensionAPI, getContext: () => ExtensionCon
 	pi.on("agent_start", () => {
 		const ctx = getContext();
 		if (!ctx) return;
-		parentWakeFor(pi, ctx).agentStarted();
 		const value = state(ctx);
 		value.runSerial++;
 		value.aborted = ctx.signal?.aborted === true;
@@ -78,10 +76,6 @@ export function bindInboxEvents(pi: ExtensionAPI, getContext: () => ExtensionCon
 		ctx.signal?.addEventListener("abort", () => { if (value.runSerial === runSerial) value.aborted = true; }, { once: true });
 		wakePending();
 	});
-	pi.on("session_shutdown", (event, ctx) => {
-		// Use the event context: manager shutdown may already have cleared its active context.
-		parentWakeFor(pi, ctx).sessionShutdown(event.reason);
-	});
 	pi.on("agent_end", (event) => {
 		const ctx = getContext();
 		if (!ctx) return;

package/src/talk-delivery.ts

@@ -2,7 +2,6 @@ import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-a
 import { MESSAGE_TYPE, removeTalk, type TalkDirection } from "./channel.js";
 import type { DelegateManifest, TalkMessage } from "./types.js";
 import { readTalkReceipt } from "./talk-message.js";
-import { parentWakeFor } from "./parent-wake.js";
 import { canUseNativeQueue, forgetTalk, markTalkQueued, rememberTalk } from "./inbox-state.js";
 
 function hasReceipt(ctx: ExtensionContext, direction: TalkDirection, runId: string, messageId: string): boolean {
@@ -27,7 +26,6 @@ export function deliverTalk(
 	content: string,
 ): "acknowledged" | "waiting" | "sent" {
 	if (hasReceipt(ctx, direction, manifest.runId, message.id)) {
-		if (!parentWakeFor(pi, ctx).retryFailedWake()) return "waiting";
 		forgetTalk(ctx, direction, manifest.runId, message.id);
 		removeTalk(channelDir, direction, message.id);
 		return "acknowledged";
@@ -39,9 +37,8 @@ export function deliverTalk(
 	try {
 		// Pi owns waiting behind current work, not Pi Subagent. In-flight IDs prevent
 		// repeated file notifications from submitting the same follow-up twice.
-		// Keep peer content in the custom inbox card. Idle runs use a separate,
-		// fixed user wake so Pi assembles the profile sections through its input pipeline.
-		parentWakeFor(pi, ctx).sendMessage({
+		// Pi 1.2+ prepares idle custom-message runs and preserves their prompt sections.
+		pi.sendMessage({
 			customType: MESSAGE_TYPE,
 			content,
 			display: true,

package/docs/third-party-notices.md

@@ -1,25 +0,0 @@
-# Third-party notices
-
-`src/parent-wake.ts` adapts the parent wake workaround from [nicobailon/pi-subagents](https://github.com/nicobailon/pi-subagents/blob/0c33ec7cb26ed1db270d72e746c3c975be880aeb/src/shared/parent-wake.ts).
-
-## pi-subagents — MIT License
-
-Copyright (c) 2026 Nico Bailon
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/src/parent-wake.ts

@@ -1,86 +0,0 @@
-// Adapted from nicobailon/pi-subagents (MIT), src/shared/parent-wake.ts.
-// Copyright (c) 2026 Nico Bailon. See docs/third-party-notices.md.
-import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-
-// Shared by Main and Sub. Peer content stays in the custom message, never in this prompt.
-export const PARENT_WAKE_TEXT = "Process the new Pi Subagent inbox messages above and continue the task already authorized for this session. Follow your profile and communication protocol. Do not infer new user authorization.";
-export const WAKE_PENDING_MS = 10_000;
-
-type WakeContext = Pick<ExtensionContext, "isIdle" | "sessionManager">;
-type WakeReservation = { sessionId: string; sentAt?: number; failed?: boolean };
-const reservationsSymbol = Symbol.for("pi-subagent.parent-wake-reservations.v1");
-const wakeGlobal = globalThis as typeof globalThis & { [reservationsSymbol]?: WeakMap<object, WakeReservation> };
-const reservations = wakeGlobal[reservationsSymbol] ?? (wakeGlobal[reservationsSymbol] = new WeakMap<object, WakeReservation>());
-
-export interface ParentWake {
-	sendMessage(...args: Parameters<ExtensionAPI["sendMessage"]>): void;
-	/** A custom receipt alone must not acknowledge a synchronously failed wake. */
-	retryFailedWake(): boolean;
-	bindSession(ctx: WakeContext): void;
-	agentStarted(): void;
-	sessionShutdown(reason: string | undefined): void;
-}
-
-export function createParentWake(pi: Pick<ExtensionAPI, "sendMessage" | "sendUserMessage">, now: () => number = Date.now): ParentWake {
-	let ctx: WakeContext;
-	let reservation: WakeReservation = { sessionId: "" };
-	const wake = () => {
-		if (reservation.sentAt !== undefined && now() - reservation.sentAt < WAKE_PENDING_MS) return;
-		reservation.sentAt = now();
-		try {
-			// Steer safely queues the wake if another prompt starts a run first.
-			pi.sendUserMessage(PARENT_WAKE_TEXT, { deliverAs: "steer" });
-			reservation.failed = false;
-		} catch (error) {
-			reservation.sentAt = undefined;
-			reservation.failed = true;
-			throw error;
-		}
-	};
-	return {
-		sendMessage(message, options) {
-			if (options?.triggerTurn !== true || !ctx.isIdle()) {
-				pi.sendMessage(message, options);
-				return;
-			}
-			// Pi's idle custom-message wake bypasses before_agent_start (#5581/#10267).
-			// Retain custom rendering but use native user-input preparation to start the run.
-			pi.sendMessage(message, { triggerTurn: false });
-			wake();
-		},
-		retryFailedWake() {
-			if (!reservation.failed) return true;
-			if (!ctx.isIdle()) return false;
-			wake();
-			return true;
-		},
-		bindSession(context) {
-			ctx = context;
-			const sessionId = context.sessionManager.getSessionId();
-			const retained = reservations.get(context.sessionManager);
-			reservation = retained?.sessionId === sessionId ? retained : { sessionId };
-			reservations.set(context.sessionManager, reservation);
-		},
-		agentStarted() {
-			reservation.sentAt = undefined;
-			reservation.failed = false;
-		},
-		sessionShutdown(reason) {
-			if (reason !== "reload") {
-				reservation.sentAt = undefined;
-				reservation.failed = false;
-			}
-		},
-	};
-}
-
-const runtimes = new WeakMap<ExtensionAPI, ParentWake>();
-export function parentWakeFor(pi: ExtensionAPI, ctx: WakeContext): ParentWake {
-	let wake = runtimes.get(pi);
-	if (!wake) {
-		wake = createParentWake(pi);
-		runtimes.set(pi, wake);
-	}
-	wake.bindSession(ctx);
-	return wake;
-}