oira666_pi-subagent 0.7.0 → 0.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,6 +3,7 @@ import { ackBrokerJob, listBrokerJobs, watchBrokerJob } from "../broker/files.js
3
3
  import { steerBrokerJob } from "../broker/commands.js";
4
4
  import { WORKER_TOKEN_ENV } from "../runner/tree-admission.js";
5
5
  import { branchEntries } from "../resume.js";
6
+ import { sessionEntryMessage } from "../storage/session-entries.js";
6
7
  import { buildSubagentDetails, DEFAULT_DELEGATION_MODE } from "../types.js";
7
8
  import { startBackground, notifyLead } from "./async-jobs.js";
8
9
  import { publishCompletion } from "./completion.js";
@@ -50,8 +51,9 @@ export function brokerProxyHandle(endpoint: BrokerEndpoint, spec: BrokerJobSpec)
50
51
  function consumedIds(ctx: SessionContext): Set<string> {
51
52
  const consumed = new Set<string>();
52
53
  for (const entry of branchEntries(ctx)) {
53
- if (entry.type === "message" && entry.message.role === "custom") {
54
- const details = entry.message.details;
54
+ const message = sessionEntryMessage(entry);
55
+ if (message?.role === "custom") {
56
+ const details = message.details;
55
57
  if (details && typeof details === "object" && "brokerJobId" in details && typeof details.brokerJobId === "string")
56
58
  consumed.add(details.brokerJobId);
57
59
  }
@@ -1,4 +1,5 @@
1
1
  import * as fs from "node:fs";
2
+ import { sessionEntryMessage } from "../storage/session-entries.js";
2
3
  import { findPersistedNamesIdentity } from "../names.js";
3
4
  import { RESUME_PROVIDER } from "../shared.js";
4
5
  import { formatCombinedUsageStatusLine } from "../tree.js";
@@ -284,9 +285,8 @@ export function collectCombinedUsageStatusLine(
284
285
  addRawUsage(entry.usage, false);
285
286
  continue;
286
287
  }
287
- if (entry?.type !== "message") continue;
288
- const msg = entry.message;
289
- if (!isRecord(msg)) continue;
288
+ const msg = sessionEntryMessage(entry);
289
+ if (!msg) continue;
290
290
  if (
291
291
  (msg.role === "toolResult" && isSubagentToolName(msg.toolName)) ||
292
292
  (msg.role === "custom" && msg.customType === "subagent_completion")
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oira666_pi-subagent",
3
- "version": "0.7.0",
3
+ "version": "0.7.1",
4
4
  "description": "Subagent extension for Pi coding agent. Delegate tasks to specialized agents.",
5
5
  "type": "module",
6
6
  "main": "index.ts",
package/resume.ts CHANGED
@@ -5,6 +5,7 @@ import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
5
5
  import { parseBoolean, RESUME_PROVIDER } from "./shared.js";
6
6
  import { isBudgetAmount } from "./budget.js";
7
7
  import { isRecord, sanitizePathComponent } from "./storage/values.js";
8
+ import { sessionEntryMessages } from "./storage/session-entries.js";
8
9
  import {
9
10
  asyncJobId,
10
11
  getNestedSubagentResults,
@@ -253,9 +254,7 @@ export function findLatestResumableSubagentCalls(ctx: ExtensionContext): Resumab
253
254
 
254
255
  // Completion messages may arrive long after the launch tool returned. Merge
255
256
  // by launch ID and task index rather than treating them as unrelated progress.
256
- for (const nested of getNestedSubagentResults(
257
- entries.flatMap((entry) => (entry.type === "message" ? [entry.message] : [])),
258
- )) {
257
+ for (const nested of getNestedSubagentResults(sessionEntryMessages(entries))) {
259
258
  const recorded = results.get(nested.toolCallId);
260
259
  if (recorded && asyncJobId(nested.details)) {
261
260
  results.set(nested.toolCallId, { ...recorded, details: nested.details, isError: nested.isError });
@@ -0,0 +1,32 @@
1
+ import { isRecord } from "./values.js";
2
+
3
+ /**
4
+ * Return the agent message a persisted session entry contributes.
5
+ *
6
+ * Pi stores `pi.sendMessage()` output (e.g. async subagent completions) as
7
+ * `custom_message` entries rather than `message` entries, and only converts
8
+ * them to `{ role: "custom" }` messages when it builds the LLM context. Code
9
+ * that scans raw session entries must apply the same conversion or it will
10
+ * never see those messages.
11
+ */
12
+ export function sessionEntryMessage(entry: unknown): Record<string, unknown> | undefined {
13
+ if (!isRecord(entry)) return undefined;
14
+ if (entry.type === "message") return isRecord(entry.message) ? entry.message : undefined;
15
+ if (entry.type !== "custom_message" || typeof entry.customType !== "string") return undefined;
16
+ const timestamp = typeof entry.timestamp === "string" ? Date.parse(entry.timestamp) : entry.timestamp;
17
+ return {
18
+ role: "custom",
19
+ customType: entry.customType,
20
+ content: entry.content ?? [],
21
+ display: entry.display,
22
+ details: entry.details,
23
+ timestamp,
24
+ };
25
+ }
26
+
27
+ export function sessionEntryMessages(entries: readonly unknown[]): Record<string, unknown>[] {
28
+ return entries.flatMap((entry) => {
29
+ const message = sessionEntryMessage(entry);
30
+ return message ? [message] : [];
31
+ });
32
+ }
package/ui/session.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import * as fs from "node:fs";
2
2
  import * as path from "node:path";
3
3
  import { asRecord } from "./value.js";
4
+ import { sessionEntryMessages } from "../storage/session-entries.js";
4
5
 
5
6
  export function sessionFilesIn(sessionDir: string): string[] {
6
7
  try {
@@ -40,5 +41,5 @@ export function readSessionEntries(file: string): Record<string, unknown>[] {
40
41
  }
41
42
 
42
43
  export function readSessionMessages(file: string): unknown[] {
43
- return readSessionEntries(file).filter((entry) => entry.type === "message" && entry.message);
44
+ return sessionEntryMessages(readSessionEntries(file));
44
45
  }
package/ui/tree-build.ts CHANGED
@@ -236,7 +236,7 @@ function loadNestedNodesFromSession(sessionDir: string): TreeNode[] {
236
236
  const files = sessionFilesIn(sessionDir);
237
237
  const file = files[files.length - 1];
238
238
  if (!file) return [];
239
- const messages = readSessionMessages(file).map((entry) => asRecord(entry).message);
239
+ const messages = readSessionMessages(file);
240
240
  return buildNestedChildren({ exitCode: 0, messages }, true);
241
241
  }
242
242