pi-maestro-teammate 2.6.1 → 2.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-maestro-teammate",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "Pi extension — teammate agent dispatch with DAG task graphs, RPC messaging, and compact TUI",
   "type": "module",
   "engines": {

package/src/agents/agents.ts

@@ -197,6 +197,23 @@ function isReservedAgentName(name: string): boolean {
   return isBuiltinAgentName(name);
 }
 
+function agentDefinitionFingerprint(agent: AgentConfig): string {
+  return JSON.stringify([
+    agent.name,
+    agent.description,
+    agent.tools ?? null,
+    agent.model ?? null,
+    agent.fallbackModels ?? null,
+    agent.taskType ?? null,
+    agent.thinking ?? null,
+    agent.systemPromptMode,
+    agent.inheritProjectContext,
+    agent.inheritSkills,
+    agent.defaultContext ?? null,
+    agent.systemPrompt,
+  ]);
+}
+
 interface DiscoveryDirs {
   legacyUserAgentsDir: string;
   userPiAgentsDir: string;
@@ -394,8 +411,17 @@ export function discoverAgents(
   }> = [];
   const mergeAgent = (agent: AgentConfig): void => {
     // Builtin names are reserved so custom definitions cannot silently replace
-    // the stable general, exploration, and DAG orchestration roles.
+    // the stable general, exploration, and DAG orchestration roles. Package
+    // catalogs may carry byte-equivalent builtin mirrors for other consumers;
+    // those are duplicates, not attempted overrides.
     if (agent.source !== "builtin" && isReservedAgentName(agent.name)) {
+      const builtin = agentMap.get(agent.name);
+      if (
+        builtin?.source === "builtin"
+        && agentDefinitionFingerprint(builtin) === agentDefinitionFingerprint(agent)
+      ) {
+        return;
+      }
       rejectedCandidates.push({ name: agent.name, reason: "reserved-builtin", candidate: agent });
       return;
     }

package/src/extension/index.ts

@@ -487,7 +487,7 @@ import {
   type RuntimeReadModelSnapshotV2,
 } from "../runtime-v2/read-model.ts";
 import { RuntimeReadModelBrokerBridge } from "../runtime-v2/broker-read-model.ts";
-import { formatLocalAgentMessage } from "../shared/routing.ts";
+import { formatLocalAgentMessage, formatNoRestorableRuntimeError } from "../shared/routing.ts";
 export * from "./teammate-core.ts";
 import {
   appendTeammateDepthContext,
@@ -2704,7 +2704,7 @@ export default function registerTeammateExtension(
       const restarted = agent.status === "sleeping" && agent.restart?.(message, provenance) === true;
       if (!restarted) {
         restoreDeferredAgentContext(agent, deferredContext);
-        return { delivered: false, error: `Agent "${targetLabel}" has no restorable runtime.` };
+        return { delivered: false, error: formatNoRestorableRuntimeError(targetLabel, agent.status) };
       }
       const restartDelivery = agent.restartDelivery;
       if (restartDelivery) {
@@ -6201,7 +6201,7 @@ export default function registerTeammateExtension(
       const agent = cid ? state.activeRuns.get(cid) : undefined;
       if (agent && !LIVE_AGENT_STATUSES.has(agent.status)) {
         return {
-          content: [{ type: "text", text: `Agent "${params.to}" is already ${agent.status} and cannot receive commands.` }],
+          content: [{ type: "text", text: formatNoRestorableRuntimeError(params.to, agent.status) }],
           isError: true,
           details: { delivered: false },
         };

package/src/extension/teammate-proxy.ts

@@ -20,7 +20,11 @@ import type { AgentToolResult } from "@earendil-works/pi-agent-core";
 import { Check } from "typebox/value";
 import { isGuiTeammateToolAllowed, registerGuiTool, unregisterGuiTool } from "../shared/gui-registry.ts";
 import { aggregateAgentRunPhase, projectAgentRuntime } from "../shared/agent-status.ts";
-import { formatLocalAgentMessage, resolveAgentCompletionTarget } from "../shared/routing.ts";
+import {
+  formatLocalAgentMessage,
+  formatNoRestorableRuntimeError,
+  resolveAgentCompletionTarget,
+} from "../shared/routing.ts";
 import { Text, truncateToWidth } from "@earendil-works/pi-tui";
 import { TeammateParams, TeammateSendParams, TeammateListParams, TeammateWatchParams, TeammateWaitParams, TeammateMonitorParams, ObserveParams, LocalObserveParams } from "./schemas.ts";
 import {
@@ -3113,7 +3117,7 @@ export async function handleProxyRequest(
       const agent = state.activeRuns.get(cid);
       if (agent && !LIVE_AGENT_STATUSES.has(agent.status)) {
         reply({ type: "teammate_proxy_result", requestId, result: {
-          content: [{ type: "text", text: `Agent "${to}" is already ${agent.status} and cannot receive commands.` }],
+          content: [{ type: "text", text: formatNoRestorableRuntimeError(to, agent.status) }],
           isError: true, details: { delivered: false },
         }});
         return;
@@ -3298,7 +3302,7 @@ export async function handleProxyRequest(
         if (!restarted || !agent) {
           if (agent) restoreDeferredAgentContext(agent, deferredContext);
           reply({ type: "teammate_proxy_result", requestId, result: {
-            content: [{ type: "text", text: `Agent "${to}" has no restorable runtime.` }],
+            content: [{ type: "text", text: formatNoRestorableRuntimeError(to, agent?.status) }],
             isError: true, details: { delivered: false },
           }});
           return;

package/src/shared/routing.ts

@@ -96,3 +96,13 @@ export function formatLocalAgentMessage(input: LocalAgentMessageInput): string {
     input.message,
   ].join("\n");
 }
+
+/** Explain why a settled local agent cannot accept another message and how to continue. */
+export function formatNoRestorableRuntimeError(label: string, status?: string): string {
+  const state = status === "completed"
+    ? "has completed"
+    : status
+      ? `is ${status}`
+      : "is unavailable";
+  return `Agent "${label}" ${state} and has no restorable runtime. Dispatch a new teammate and pass the previous agent:// publication via tasks[].briefing.`;
+}

package/types/shared/routing.d.ts

@@ -37,3 +37,5 @@ export interface LocalAgentMessageInput {
 }
 /** Canonical model-visible envelope for local agent-to-agent messages. */
 export declare function formatLocalAgentMessage(input: LocalAgentMessageInput): string;
+/** Explain why a settled local agent cannot accept another message and how to continue. */
+export declare function formatNoRestorableRuntimeError(label: string, status?: string): string;