@giladbarnea/pi-user-agents 0.0.15 → 0.0.16

package/INTERNALS.md

@@ -73,7 +73,7 @@ The file itself appears on the child's first assistant message (`_persist` defer
 
 The session file does not persist the dispatch options, so every dispatch writes a `pi-user-agents-dispatch` custom entry into the child — the forwarded pi tokens, the plain task, and the isolate flag. At attach the record replays through the same projections dispatch used (`buildChildResourceLoaderOptions`, `resolveToolOptions`), so `--tools`, `--no-extensions`, `--system-prompt` and friends survive the round trip instead of silently widening back to pi defaults. The model and thinking level deliberately come from the file, not the record: reattachment is pi's own resume path — `SessionManager.open` plus `createAgentSessionFromServices` on a non-empty manager takes `createAgentSession`'s has-existing-session branch — and the file reflects any later changes. A record-less child (dispatched before the record existed, or `/fork`-made) still attaches, with pi's default tools and resources.
 
-The dispatch preamble — built at the dispatch call site, sent verbatim by `runChildTurns`, or its pane counterpart for `-h` children — doubles as the boundary marker: `splitAtDispatchBoundary` finds the first user message carrying either and recovers the child's own conversation for the overlay and the inherited base whose fingerprint re-arms the rebase fast-forward. The fingerprint compares content, not file bookkeeping: rebuilding custom, compaction, and branch summaries from a session file re-stamps their timestamps (and a branch summary's `fromId`), so `conversationFingerprint` drops those fields or a round-tripped base would never equal main's live context. Without a recognizable boundary (a fork child, or a child whose compaction summarized it away) the whole context attaches and the base is a sentinel that never matches, so `r` stays withheld.
+The dispatch preamble — built at the dispatch call site, sent verbatim by `runChildTurns`, or its pane counterpart for `-h` children — doubles as the boundary marker: `splitAtDispatchBoundary` finds the first user message carrying either and recovers the child's own conversation for the overlay and the inherited base whose fingerprint re-arms the rebase fast-forward. The system messages directly before that prompt belong to the child's conversation: Pi persists the child's prompt and tool changes there on its first request, and counting them as base made every reattached child look drifted. The fingerprint compares content, not file bookkeeping: rebuilding custom, compaction, and branch summaries from a session file re-stamps their timestamps (and a branch summary's `fromId`), so `conversationFingerprint` drops those fields or a round-tripped base would never equal main's live context. Without a recognizable boundary (a fork child, or a child whose compaction summarized it away) the whole context attaches and the base is a sentinel that never matches, so `r` stays withheld.
 
 The attached agent parks idle first (`runAttachedTurns` waits for an instruction before running the shared turn loop), and its latest persisted response seeds `pendingSquashMessage`, so steering, `s`, and `r` work immediately without a new turn. A successful attach leaves an `Attached session …` breadcrumb — the detach line's counterpart — and both success states end with a "View agent?" confirmation that opens the overlay.
 

package/attach.ts

@@ -53,7 +53,8 @@ export type DispatchBoundary = {
 /**
  * Split a child's resolved context at its dispatch boundary — the first user message carrying
  * a dispatch preamble. Undefined when no message carries one (a /fork child, or a child whose
- * own compaction summarized the boundary away).
+ * own compaction summarized the boundary away). The system messages right before that prompt are
+ * the child's own: Pi persists its prompt and tool changes there on the child's first request.
  */
 export function splitAtDispatchBoundary(
 	messages: readonly AgentMessage[],
@@ -63,9 +64,11 @@ export function splitAtDispatchBoundary(
 		const text = userMessageText(message);
 		const preamble = DISPATCH_PREAMBLES.find((candidate) => text.startsWith(candidate));
 		if (preamble === undefined) continue;
+		let conversationStart = index;
+		while (messages[conversationStart - 1]?.role === "system") conversationStart -= 1;
 		return {
-			base: messages.slice(0, index),
-			conversation: messages.slice(index),
+			base: messages.slice(0, conversationStart),
+			conversation: messages.slice(conversationStart),
 			task: text.slice(preamble.length),
 		};
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giladbarnea/pi-user-agents",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "Run, view, and control background Pi agents.",
   "keywords": [
     "pi-package",