zob-harness 0.2.0 → 0.3.0

package/.pi/extensions/zob-harness/src/runtime/events.ts

@@ -2,31 +2,31 @@ import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-a
 import { compact, generateBranchSummary, isToolCallEventType } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 
-import { MODE_PROMPTS, ZOB_COMPACTION_CONTINUITY_CONTRACT, ZOB_TOOL_ROUTING_CONTRACT } from "../constants.js";
-import { buildCurrentZobLivePeerCard } from "../coms-v2/identity.js";
-import { buildZobLiveAckEnvelope, buildZobLiveErrorEnvelope, buildZobLivePongEnvelope } from "../coms-v2/envelope.js";
-import { appendLiveCompletedRef } from "../coms-v2/ledger-bridge.js";
-import { bindZobLocalEndpoint, makeZobLocalEndpoint, sendZobLocalEnvelope } from "../coms-v2/local-transport.js";
-import { readZobComsV2Policy } from "../coms-v2/policy.js";
-import { registerCurrentZobLivePeer, touchCurrentZobLivePeer, unregisterCurrentZobLivePeer, writeZobLivePeerCard } from "../coms-v2/registry.js";
-import { clearZpeerNewCarryoverProfile, readZpeerLocalProfile, readZpeerNewCarryoverProfile, writeZpeerLocalProfileFromPeer, writeZpeerNewCarryoverProfile, zpeerProfileIdIsSharedFallback } from "../coms-v2/zpeer-profile.js";
-import { buildZpeerRoomSummary, ensureZpeerFields, refreshZpeerSelf } from "../coms-v2/zpeer.js";
-import type { ZpeerRoomMembership } from "../coms-v2/types.js";
-import { buildZobLiveResponseEnvelope } from "../coms-v2/response-capture.js";
-import { writeZobComsRedactedCapture } from "../coms-v2/transcript-capture.js";
-import { formatGoalActivationMode, runtimeGoalStatusLine } from "../goal-runtime.js";
-import { formatInteractiveAutonomyPromptHint, formatMissionReadinessForUi, scoreMissionReadiness, toMissionReadinessLedgerEntry } from "../interactive-autonomy.js";
-import { formatGoalTodoPromptHint } from "../goal-todos.js";
-import { resolveRuleProfile } from "../rules.js";
-import { loadDamageRules } from "../safety.js";
-import { loadTeamDefinition, validateTeamDefinition } from "../topology/teams.js";
-import { loadZagentManifest, normalizeZagentRoomBindings, readZagentPrompt } from "../zagents.js";
+import { EXTERNAL_PACKAGE_TOOLS_CONTRACT, MODE_PROMPTS, ZOB_COMPACTION_CONTINUITY_CONTRACT, ZOB_TOOL_ROUTING_CONTRACT } from "../core/constants.js";
+import { buildCurrentZobLivePeerCard } from "../domains/coms/coms-v2/identity.js";
+import { buildZobLiveAckEnvelope, buildZobLiveErrorEnvelope, buildZobLivePongEnvelope } from "../domains/coms/coms-v2/envelope.js";
+import { appendLiveCompletedRef } from "../domains/coms/coms-v2/ledger-bridge.js";
+import { bindZobLocalEndpoint, makeZobLocalEndpoint, sendZobLocalEnvelope } from "../domains/coms/coms-v2/local-transport.js";
+import { readZobComsV2Policy } from "../domains/coms/coms-v2/policy.js";
+import { registerCurrentZobLivePeer, touchCurrentZobLivePeer, unregisterCurrentZobLivePeer, writeZobLivePeerCard } from "../domains/coms/coms-v2/registry.js";
+import { clearZpeerNewCarryoverProfile, readZpeerLocalProfile, readZpeerNewCarryoverProfile, writeZpeerLocalProfileFromPeer, writeZpeerNewCarryoverProfile, zpeerProfileIdIsSharedFallback } from "../domains/coms/coms-v2/zpeer-profile.js";
+import { buildZpeerPeerRoomSummaries, ensureZpeerFields, refreshZpeerSelf } from "../domains/coms/coms-v2/zpeer.js";
+import type { ZpeerRoomMembership } from "../domains/coms/coms-v2/types.js";
+import { buildZobLiveResponseEnvelope } from "../domains/coms/coms-v2/response-capture.js";
+import { writeZobComsRedactedCapture } from "../domains/coms/coms-v2/transcript-capture.js";
+import { formatGoalActivationMode, runtimeGoalStatusLine } from "./goal-runtime.js";
+import { formatInteractiveAutonomyPromptHint, formatMissionReadinessForUi, scoreMissionReadiness, toMissionReadinessLedgerEntry } from "../domains/autonomy/interactive-autonomy.js";
+import { formatGoalTodoPromptHint } from "../domains/goal/goal-todos.js";
+import { resolveRuleProfile } from "../domains/governance/rules.js";
+import { loadDamageRules } from "../domains/governance/safety.js";
+import { loadTeamDefinition, validateTeamDefinition } from "../domains/topology/teams.js";
+import { loadZagentManifest, readZagentPrompt, resolveZagentRuntimeRoomBindings } from "../domains/coms/zagents.js";
 import type { AssistantLikeMessage } from "../types.js";
-import { blockedFeedback } from "../utils/formatting.js";
-import { sha256 } from "../utils/hashing.js";
-import { buildZcommitPlan, recordZcommitTouchedFile, runGovernedZcommitCommit, runGovernedZcommitPush, type ZcommitCommandResult, type ZcommitOwnedPathRef, type ZcommitPlan } from "../git-ops.js";
-import { pathMatches } from "../utils/paths.js";
-import { isRecord, textFromMessage } from "../utils/records.js";
+import { blockedFeedback } from "../core/utils/formatting.js";
+import { sha256 } from "../core/utils/hashing.js";
+import { buildZcommitPlan, recordZcommitTouchedFile, runGovernedZcommitCommit, runGovernedZcommitPush, type ZcommitCommandResult, type ZcommitOwnedPathRef, type ZcommitPlan } from "../domains/git/git-ops.js";
+import { pathMatches } from "../core/utils/paths.js";
+import { isRecord, textFromMessage } from "../core/utils/records.js";
 import { showDelegationOverlay } from "./delegation-overlay.js";
 import { buildDeterministicZobCompactionResult, buildDeterministicZobCompactionSummary, buildZobCompactionInstructions, buildZobCompactionLedgerEntry, withZobCompactionDetails, ZOB_COMPACTION_ENTRY_TYPE, zobCompactionBodyFreeViolations } from "./compaction-policy.js";
 import { buildZcompactPreparation, cancelZcompactPending, maybeTriggerZcompact, runZcompactCompactionHook } from "./auto-compaction.js";
@@ -78,17 +78,20 @@ function loadActiveZagentById(state: HarnessRuntimeState, repoRoot: string, zage
   const loaded = loadZagentManifest(repoRoot, zagentId);
   const manifest = loaded.manifest;
   const prompt = readZagentPrompt(repoRoot, manifest.promptRef);
-  const rooms = normalizeZagentRoomBindings(manifest.rooms, manifest.defaultRoom, manifest.activeRoom);
+  const resolved = resolveZagentRuntimeRoomBindings(repoRoot, manifest);
+  const rooms = resolved.rooms;
   const activeRoom = manifest.activeRoom ?? rooms.find((room) => room.active)?.id ?? manifest.defaultRoom;
   const errors = [...loaded.errors, ...prompt.errors];
   const nextZagent: ActiveZagentState = {
     id: manifest.id,
-    team: manifest.team,
+    team: manifest.team ?? resolved.teamIds[0],
+    teams: resolved.teamIds,
     role: manifest.role,
     alias: manifest.alias,
     description: manifest.description,
     rooms,
     activeRoom,
+    defaultMode: manifest.defaultMode,
     prompt: prompt.body,
     promptRef: manifest.promptRef,
     path: loaded.path,
@@ -136,7 +139,7 @@ function formatZagentPromptHint(state: HarnessRuntimeState): string {
   const policy = zagent.communicationPolicy ? JSON.stringify(zagent.communicationPolicy) : "not specified";
   const errors = zagent.errors.length > 0 ? `\n- load warnings: ${zagent.errors.slice(0, 5).join(" | ")}` : "";
   const promptBody = zagent.prompt?.trim() ? `\n\nZAGENT PROMPT BODY\n${zagent.prompt.trim()}` : "";
-  return `\n\nZAGENT RUNTIME ACTIVATION\n- id: ${zagent.id}\n- team: ${zagent.team ?? "default"}\n- role: ${zagent.role ?? "not specified"}\n- alias: ${zagent.alias ? `@${zagent.alias}` : "not specified"}\n- rooms: ${rooms.join(", ") || "none"}\n- activeRoom: ${zagent.activeRoom ?? "not specified"}\n- communicationPolicy: ${policy}\n- promptRef: ${zagent.promptRef ?? "none"}\n- ZAgents are full Pi sessions tied to ZPeer/live coordination, not delegate subagents.${errors}${promptBody}`;
+  return `\n\nZAGENT RUNTIME ACTIVATION\n- id: ${zagent.id}\n- team: ${zagent.team ?? "default"}\n- teams: ${zagent.teams?.join(", ") || zagent.team || "default"}\n- role: ${zagent.role ?? "not specified"}\n- alias: ${zagent.alias ? `@${zagent.alias}` : "not specified"}\n- rooms: ${rooms.join(", ") || "none"}\n- activeRoom: ${zagent.activeRoom ?? "not specified"}\n- defaultMode: ${zagent.defaultMode ?? "not specified"}\n- communicationPolicy: ${policy}\n- promptRef: ${zagent.promptRef ?? "none"}\n- ZAgents are full Pi sessions tied to ZPeer/live coordination, not delegate subagents.${errors}${promptBody}`;
 }
 
 function zpeerRuntimeProfileId(ctx: ExtensionContext): string {
@@ -309,13 +312,22 @@ function buildZpeerAwarenessPrompt(state: HarnessRuntimeState, repoRoot: string)
   if (!state.zobLive.peerCard) {
     return "\n\nZPEER AWARENESS\n- local peer endpoint: unavailable this turn\n- Use zpeer_ask with mode=\"async\" or /zpeer only when useful or user-requested for peer coordination; avoid spam/loops and do not invent hidden worker-to-worker chat.";
   }
-  const summary = buildZpeerRoomSummary(repoRoot, state.zobLive.peerCard);
-  const memberships = state.zobLive.peerCard.zpeerMemberships?.length ?? summary.membershipCount ?? 1;
-  const selfAlias = summary.selfAlias ?? "?";
-  const peerAliases = summary.aliases.filter((alias) => alias !== selfAlias).slice(0, 8).map((alias) => `@${alias}`);
-  const unavailable = summary.stale + summary.offline;
-  const duplicateLine = summary.duplicateAliases.length > 0 ? `\n- duplicate aliases: ${summary.duplicateAliases.map((alias) => `@${alias}`).join(", ")}` : "";
-  return `\n\nZPEER AWARENESS (transient, rebuilt each turn)\n- room: ${summary.roomId}\n- memberships: ${memberships}\n- self: @${selfAlias}\n- online peers: ${peerAliases.join(", ") || "none"}\n- unavailable peers: ${unavailable} (stale=${summary.stale}, offline=${summary.offline})${duplicateLine}\n- posture: local_socket-only, room-scoped, hash-only durable ledgers, bodyStored=false, networkEnabled=false\n- For non-trivial review/debug/planning peer coordination, agents may use zpeer_ask with mode=\"async\" so the request is visible, governed, and non-blocking; /zpeer remains the interactive command path.\n- Passive wait rule: if the only remaining action is waiting for ZPeer/coms replies, stop the turn and remain idle; do not poll, call tools, or continue just to wait.\n- Use ZPeer only when useful or user-requested; avoid spam, duplicate asks, and reply loops; do not use it for hidden free chat or to bypass topology/safety gates.\n- Raw ZPeer bodies are transient; durable records must remain hash-only/bodyStored=false.\n- last ZPeer event: ${formatZpeerLastEvent(state.zobLive.lastEvent)}`;
+  const summaries = buildZpeerPeerRoomSummaries(repoRoot, state.zobLive.peerCard);
+  const activeSummary = summaries.find((summary) => summary.active) ?? summaries[0];
+  const memberships = (state.zobLive.peerCard.zpeerMemberships?.length ?? summaries.length) || 1;
+  const roomLines = summaries.slice(0, 6).map((summary) => {
+    const selfAlias = summary.selfAlias ?? "?";
+    const peerAliases = summary.aliases.filter((alias) => alias !== selfAlias).slice(0, 6).map((alias) => `@${alias}`);
+    const unavailable = summary.stale + summary.offline;
+    const duplicateText = summary.duplicateAliases.length > 0 ? ` duplicates=${summary.duplicateAliases.map((alias) => `@${alias}`).join(",")}` : "";
+    return `  - ${summary.active ? "*" : " "} ${summary.roomId}: self=@${selfAlias}; online=${peerAliases.join(",") || "none"}; unavailable=${unavailable} (stale=${summary.stale}, offline=${summary.offline})${duplicateText}`;
+  });
+  if (summaries.length > 6) roomLines.push(`  - +${summaries.length - 6} more room${summaries.length - 6 === 1 ? "" : "s"}`);
+  const activeSelfAlias = activeSummary?.selfAlias ?? "?";
+  const activePeerAliases = (activeSummary?.aliases ?? []).filter((alias) => alias !== activeSelfAlias).slice(0, 8).map((alias) => `@${alias}`);
+  const activeUnavailable = (activeSummary?.stale ?? 0) + (activeSummary?.offline ?? 0);
+  const activeDuplicateLine = activeSummary && activeSummary.duplicateAliases.length > 0 ? `\n- duplicate aliases: ${activeSummary.duplicateAliases.map((alias) => `@${alias}`).join(", ")}` : "";
+  return `\n\nZPEER AWARENESS (transient, rebuilt each turn)\n- active room: ${activeSummary?.roomId ?? "default"}\n- memberships: ${memberships}\n- self: @${activeSelfAlias}\n- online peers: ${activePeerAliases.join(", ") || "none"}\n- unavailable peers: ${activeUnavailable} (stale=${activeSummary?.stale ?? 0}, offline=${activeSummary?.offline ?? 0})${activeDuplicateLine}\n- rooms:\n${roomLines.join("\n") || "  - none"}\n- Use zpeer_ask with explicit roomId when targeting a non-active room.\n- posture: local_socket-only, room-scoped, hash-only durable ledgers, bodyStored=false, networkEnabled=false\n- For non-trivial review/debug/planning peer coordination, agents may use zpeer_ask with mode=\"async\" so the request is visible, governed, and non-blocking; /zpeer remains the interactive command path.\n- Passive wait rule: if the only remaining action is waiting for ZPeer/coms replies, stop the turn and remain idle; do not poll, call tools, or continue just to wait.\n- Use ZPeer only when useful or user-requested; avoid spam, duplicate asks, and reply loops; do not use it for hidden free chat or to bypass topology/safety gates.\n- Raw ZPeer bodies are transient; durable records must remain hash-only/bodyStored=false.\n- last ZPeer event: ${formatZpeerLastEvent(state.zobLive.lastEvent)}`;
 }
 
 const SAME_AGENT_MODE_INTENT_PROMPT = [
@@ -407,7 +419,7 @@ async function startOrRefreshZobLiveRuntime(pi: ExtensionAPI, state: HarnessRunt
     const server = await bindZobLocalEndpoint(endpoint, async (envelope) => {
       if (envelope.type === "ping") return buildZobLivePongEnvelope(envelope);
       if (envelope.type === "response") {
-        state.zobLive.pendingReplies.complete(envelope.msgId, envelope);
+        const completedActiveWait = state.zobLive.pendingReplies.complete(envelope.msgId, envelope);
         clearPassivePeerWaitForResponse(state, envelope);
         setZpeerLastEvent(state, {
           kind: "reply",
@@ -425,7 +437,7 @@ async function startOrRefreshZobLiveRuntime(pi: ExtensionAPI, state: HarnessRunt
           display: true,
           details: { kind: "reply", roomId: state.zobLive.lastEvent?.roomId, fromAlias: envelope.sender, toAlias: envelope.receiver, status: "reply", msgId: envelope.msgId, taskHash: envelope.taskHash, outputHash: envelope.outputHash, bodyStored: false, localOnly: true, networkEnabled: false },
         }, { triggerTurn: false });
-        if (envelope.transientResponse) {
+        if (!completedActiveWait && envelope.transientResponse) {
           void pi.sendMessage({
             customType: "zob-zpeer-response",
             content: `ZPeer async reply received from @${envelope.sender ?? "?"} to @${envelope.receiver ?? "?"}. Continue the prior task using this response; do not poll or wait further only for this reply.\n\n${envelope.transientResponse}`,
@@ -948,7 +960,7 @@ export function registerHarnessEvents(pi: ExtensionAPI, state: HarnessRuntimeSta
     if (state.activeMode === "vanilla") {
       return { systemPrompt: `${event.systemPrompt}\n\n${MODE_PROMPTS.vanilla}` };
     }
-    const contractHint = `\n\nZOB HARNESS OPERATING CONTRACT\n- Prefer Explore -> Plan -> Implement -> Oracle for non-trivial work.\n- Use the six-part contract for delegated work: TASK / EXPECTED OUTCOME / REQUIRED TOOLS / MUST DO / MUST NOT DO / CONTEXT.\n- Do not claim completion without concrete evidence.\n- If output may truncate, prioritize verdict, blockers, and next steps over exhaustive listings.\n\n${SAME_AGENT_MODE_INTENT_PROMPT}\n\n${ZOB_TOOL_ROUTING_CONTRACT}\n\n${ZOB_COMPACTION_CONTINUITY_CONTRACT}\n\n${MODE_PROMPTS[state.activeMode]}${goalHint}${runtimeGoalHint}${rulesHint}${autonomyHint}${zagentHint}${zpeerHint}`;
+    const contractHint = `\n\nZOB HARNESS OPERATING CONTRACT\n- Prefer Explore -> Plan -> Implement -> Oracle for non-trivial work.\n- Use the six-part contract for delegated work: TASK / EXPECTED OUTCOME / REQUIRED TOOLS / MUST DO / MUST NOT DO / CONTEXT.\n- Do not claim completion without concrete evidence.\n- If output may truncate, prioritize verdict, blockers, and next steps over exhaustive listings.\n\n${SAME_AGENT_MODE_INTENT_PROMPT}\n\n${ZOB_TOOL_ROUTING_CONTRACT}\n\n${ZOB_COMPACTION_CONTINUITY_CONTRACT}\n\n${EXTERNAL_PACKAGE_TOOLS_CONTRACT}\n\n${MODE_PROMPTS[state.activeMode]}${goalHint}${runtimeGoalHint}${rulesHint}${autonomyHint}${zagentHint}${zpeerHint}`;
     return { systemPrompt: `${event.systemPrompt}${contractHint}` };
   });
 
@@ -958,6 +970,9 @@ export function registerHarnessEvents(pi: ExtensionAPI, state: HarnessRuntimeSta
     state.delegations.runs = [];
     restoreHarnessState(state, ctx);
     loadActiveZagentFromEnv(state, ctx.cwd);
+    if (state.zagent.defaultMode && state.zagent.defaultMode !== state.activeMode) {
+      applyMode(pi, state, ctx, state.zagent.defaultMode, false);
+    }
     state.activeRuleResolution = resolveRuleProfile({ repoRoot: ctx.cwd, mode: state.activeMode });
     await startOrRefreshZobLiveRuntime(pi, state, ctx);
     applyMode(pi, state, ctx, state.activeMode, false);

package/.pi/extensions/zob-harness/src/{goal-runtime.ts → runtime/goal-runtime.ts}

@@ -4,12 +4,12 @@ import { StringEnum } from "@earendil-works/pi-ai";
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 
-import { parseGoalState, validateGoalState } from "./goal.js";
+import { parseGoalState, validateGoalState } from "../domains/goal/goal.js";
 import {
   importChainRunTodos,
   importFactoryRunTodos,
   importOrchestrationRunTodos,
-} from "./goal-todo-imports.js";
+} from "../domains/goal/goal-todo-imports.js";
 import {
   addGoalTodo,
   formatGoalTodoSummary,
@@ -28,12 +28,12 @@ import {
   type GoalTodoStatus,
   type GoalTodoSummary,
   type ResolveGoalTodoAction,
-} from "./goal-todos.js";
-import type { GoalState } from "./types.js";
-import type { HarnessRuntimeState } from "./runtime/state.js";
-import { sha256 } from "./utils/hashing.js";
-import { isRecord } from "./utils/records.js";
-import { buildZobCompactionInstructions } from "./runtime/compaction-policy.js";
+} from "../domains/goal/goal-todos.js";
+import type { GoalState } from "../types.js";
+import type { HarnessRuntimeState } from "./state.js";
+import { sha256 } from "../core/utils/hashing.js";
+import { isRecord } from "../core/utils/records.js";
+import { buildZobCompactionInstructions } from "./compaction-policy.js";
 
 export const ZOB_RUNTIME_GOAL_ENTRY_TYPE = "zob-runtime-goal";
 export const ZOB_GOAL_MODE_ENTRY_TYPE = "zob-goal-mode";
@@ -755,7 +755,7 @@ export async function handleGoalCommand(pi: ExtensionAPI, state: HarnessRuntimeS
   if (text === "todo overlay" || text.startsWith("todo overlay ") || text === "todo view" || text.startsWith("todo view ")) {
     const parts = text.split(/\s+/);
     const initialTodoId = parts[2];
-    const { showGoalTodoOverlay } = await import("./runtime/goal-todo-overlay.js");
+    const { showGoalTodoOverlay } = await import("./goal-todo-overlay.js");
     await showGoalTodoOverlay(ctx, state, initialTodoId);
     render();
     return;

package/.pi/extensions/zob-harness/src/runtime/goal-todo-overlay.ts

@@ -1,7 +1,7 @@
 import type { ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
 import { matchesKey, truncateToWidth, visibleWidth, type Component } from "@earendil-works/pi-tui";
 
-import { formatGoalTodoSummary, summarizeGoalTodos, type GoalTodoNode } from "../goal-todos.js";
+import { formatGoalTodoSummary, summarizeGoalTodos, type GoalTodoNode } from "../domains/goal/goal-todos.js";
 import type { HarnessRuntimeState } from "./state.js";
 
 function padToWidth(text: string, width: number): string {

package/.pi/extensions/zob-harness/src/runtime/plan-capture.ts

@@ -2,8 +2,8 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 
 import type { ModeName } from "../types.js";
-import { sha256 } from "../utils/hashing.js";
-import { safeFileStem } from "../utils/paths.js";
+import { sha256 } from "../core/utils/hashing.js";
+import { safeFileStem } from "../core/utils/paths.js";
 import { looksLikeCompletePlanResponse, stripModeIntentMarkup } from "./mode-intent.js";
 
 const PLAN_INDEX_SCHEMA = "zob.plan-index.v1";

package/.pi/extensions/zob-harness/src/runtime/state.ts

@@ -1,23 +1,23 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { TUI } from "@earendil-works/pi-tui";
 
-import { DEFAULT_RULES, MODE_PROMPTS } from "../constants.js";
+import { DEFAULT_RULES, MODE_PROMPTS } from "../core/constants.js";
 import type { ChildResult, DamageRules, DelegationFailureKind, GoalState, ModeName, QueueTickResult, RuleResolution } from "../types.js";
-import { validateGoalState, validateStrictGoalSpecAnchor, type StrictGoalSpecAnchor } from "../goal.js";
-import { DEFAULT_GOAL_ACTIVATION_MODE, restoreGoalActivationModeFromBranch, restoreRuntimeGoalFromBranch, type GoalActivationMode, type RuntimeGoal } from "../goal-runtime.js";
-import { createGoalTodoState, restoreGoalTodosFromBranch, type GoalTodoState } from "../goal-todos.js";
-import { isRecord } from "../utils/records.js";
-import type { ZobLiveEnvelope } from "../coms-v2/envelope.js";
-import type { ZobLocalTransportServer } from "../coms-v2/local-transport.js";
-import { ZobPendingReplies } from "../coms-v2/pending-replies.js";
-import type { ZobLivePeerCard } from "../coms-v2/types.js";
+import { validateGoalState, validateStrictGoalSpecAnchor, type StrictGoalSpecAnchor } from "../domains/goal/goal.js";
+import { DEFAULT_GOAL_ACTIVATION_MODE, restoreGoalActivationModeFromBranch, restoreRuntimeGoalFromBranch, type GoalActivationMode, type RuntimeGoal } from "./goal-runtime.js";
+import { createGoalTodoState, restoreGoalTodosFromBranch, type GoalTodoState } from "../domains/goal/goal-todos.js";
+import { isRecord } from "../core/utils/records.js";
+import type { ZobLiveEnvelope } from "../domains/coms/coms-v2/envelope.js";
+import type { ZobLocalTransportServer } from "../domains/coms/coms-v2/local-transport.js";
+import { ZobPendingReplies } from "../domains/coms/coms-v2/pending-replies.js";
+import type { ZobLivePeerCard } from "../domains/coms/coms-v2/types.js";
 import { createDelegationMonitorState, trimDelegationRuns, type DelegationMonitorState, type DelegationRunMode, type DelegationRunSource, type DelegationRunStatus, type DelegationRunView } from "./delegation-monitor.js";
-import { DEFAULT_DAEMON_RUNTIME_POLICY, type DaemonLoopSnapshot, type DaemonRuntimePolicy, type DaemonRuntimeState, type DaemonTickPlan } from "../daemon-runtime.js";
-import { createInteractiveAutonomyRuntimeState, restoreInteractiveAutonomyState, type InteractiveAutonomyRuntimeState } from "../interactive-autonomy.js";
+import { DEFAULT_DAEMON_RUNTIME_POLICY, type DaemonLoopSnapshot, type DaemonRuntimePolicy, type DaemonRuntimeState, type DaemonTickPlan } from "../domains/autonomy/daemon-runtime.js";
+import { createInteractiveAutonomyRuntimeState, restoreInteractiveAutonomyState, type InteractiveAutonomyRuntimeState } from "../domains/autonomy/interactive-autonomy.js";
 import type { ZobModeIntent } from "./mode-intent.js";
-import type { ZAgentRoomBinding } from "../zagents.js";
+import type { ZAgentRoomBinding } from "../domains/coms/zagents.js";
 import { createZcompactRuntimeState, restoreZcompactStateFromBranch, type ZcompactRuntimeState } from "./auto-compaction.js";
-import { createZcommitRuntimeState, recordZcommitOwnedPath, type ZcommitLastCommitRecord, type ZcommitOwnershipSource, type ZcommitRuntimeState, type ZcommitToggleState } from "../git-ops.js";
+import { createZcommitRuntimeState, recordZcommitOwnedPath, type ZcommitLastCommitRecord, type ZcommitOwnershipSource, type ZcommitRuntimeState, type ZcommitToggleState } from "../domains/git/git-ops.js";
 
 export interface DelegationMouseRuntimeState {
   tui?: TUI;
@@ -91,11 +91,13 @@ export interface DaemonHarnessRuntimeState {
 export interface ZagentRuntimeState {
   id?: string;
   team?: string;
+  teams?: string[];
   role?: string;
   alias?: string;
   description?: string;
   rooms: ZAgentRoomBinding[];
   activeRoom?: string;
+  defaultMode?: ModeName;
   prompt?: string;
   promptRef?: string;
   path?: string;

package/.pi/extensions/zob-harness/src/runtime/tools-autonomous.ts

@@ -1,7 +1,7 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
-import { AutonomousDryRunParams, AutonomousReadOnlySmokeParams, AutonomousValidateRunParams, AutonomousValidateSmokeParams } from "../schemas.js";
-import { validateAutonomousReadOnlySmokeRunArtifacts, validateAutonomousRuntimeDryRunArtifacts, writeAutonomousReadOnlySmokeRunReport, writeAutonomousRuntimeDryRunReport } from "../autonomous-runtime.js";
+import { AutonomousDryRunParams, AutonomousReadOnlySmokeParams, AutonomousValidateRunParams, AutonomousValidateSmokeParams } from "./schemas.js";
+import { validateAutonomousReadOnlySmokeRunArtifacts, validateAutonomousRuntimeDryRunArtifacts, writeAutonomousReadOnlySmokeRunReport, writeAutonomousRuntimeDryRunReport } from "../domains/autonomy/autonomous-runtime.js";
 
 export function registerAutonomousTools(pi: ExtensionAPI): void {
   pi.registerTool({

package/.pi/extensions/zob-harness/src/runtime/tools-compute.ts

@@ -1,8 +1,8 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
-import { buildComputePreview, resolveComputeProfile, validateComputeProfileArtifacts, writeComputeProfileReports } from "../compute-profile.js";
-import { buildComputeWorkflowShape } from "../compute-workflow-shape.js";
-import { ComputePlanWorkflowParams, ComputePreviewParams, ComputeResolveProfileParams, ComputeValidateProfileParams, ComputeWriteProfileReportsParams } from "../schemas.js";
+import { buildComputePreview, resolveComputeProfile, validateComputeProfileArtifacts, writeComputeProfileReports } from "../domains/compute/compute-profile.js";
+import { buildComputeWorkflowShape } from "../domains/compute/compute-workflow-shape.js";
+import { ComputePlanWorkflowParams, ComputePreviewParams, ComputeResolveProfileParams, ComputeValidateProfileParams, ComputeWriteProfileReportsParams } from "./schemas.js";
 
 export function registerComputeTools(pi: ExtensionAPI): void {
   pi.registerTool({

package/.pi/extensions/zob-harness/src/runtime/tools-coms.ts

@@ -1,13 +1,13 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { readZobComsV2Policy } from "../coms-v2/policy.js";
-import { readZobLiveRegistrySnapshot } from "../coms-v2/registry.js";
-import { peerAliasInRoom, refreshZpeerSelf, safeZpeerAlias, safeZpeerRoomId, sendZpeerPrompt, type ZpeerSendMode, type ZpeerSendResult } from "../coms-v2/zpeer.js";
-import { buildZobLiveEnvelope } from "../coms-v2/envelope.js";
-import { sendZobLocalEnvelope } from "../coms-v2/local-transport.js";
-import { appendLiveDeliveredStatus, appendLiveErrorStatus, appendLiveSendRequestedRef } from "../coms-v2/ledger-bridge.js";
-import { writeZobComsRedactedCapture } from "../coms-v2/transcript-capture.js";
+import { readZobComsV2Policy } from "../domains/coms/coms-v2/policy.js";
+import { readZobLiveRegistrySnapshot } from "../domains/coms/coms-v2/registry.js";
+import { peerAliasInRoom, refreshZpeerSelf, safeZpeerAlias, safeZpeerRoomId, sendZpeerPrompt, type ZpeerSendMode, type ZpeerSendResult } from "../domains/coms/coms-v2/zpeer.js";
+import { buildZobLiveEnvelope } from "../domains/coms/coms-v2/envelope.js";
+import { sendZobLocalEnvelope } from "../domains/coms/coms-v2/local-transport.js";
+import { appendLiveDeliveredStatus, appendLiveErrorStatus, appendLiveSendRequestedRef } from "../domains/coms/coms-v2/ledger-bridge.js";
+import { writeZobComsRedactedCapture } from "../domains/coms/coms-v2/transcript-capture.js";
 import type { TeamDefinition } from "../types.js";
-import { sha256 } from "../utils/hashing.js";
+import { sha256 } from "../core/utils/hashing.js";
 import {
   ZobComsAckParams,
   ZobComsAwaitParams,
@@ -17,7 +17,7 @@ import {
   ZobComsSendParams,
   ZobComsStatusParams,
   ZpeerAskParams,
-} from "../schemas.js";
+} from "./schemas.js";
 import {
   ackZobComsMessage,
   appendZobComsMessage,
@@ -26,8 +26,8 @@ import {
   listZobComsMessages,
   replyZobComsMessage,
   transitionZobComsStatus,
-} from "../topology/coms.js";
-import { loadTeamDefinition, validateTeamDefinition } from "../topology/teams.js";
+} from "../domains/topology/coms.js";
+import { loadTeamDefinition, validateTeamDefinition } from "../domains/topology/teams.js";
 import type { HarnessRuntimeState } from "./state.js";
 
 const SHA256_HEX = /^[a-f0-9]{64}$/i;
@@ -240,7 +240,10 @@ export function registerComsTools(pi: ExtensionAPI, state?: HarnessRuntimeState)
       pi.appendEntry("zob-zpeer", { schema: "zob.zpeer-ask.v1", action: "agent_request", mode, status: result.status, reasonHash: result.reason ? sha256(result.reason) : undefined, msgId: result.msgId, targetAliasHash: result.targetAlias ? sha256(result.targetAlias) : sha256(targetAlias), roomIdHash: sha256(result.roomId ?? requestedRoomId), taskHash: result.taskHash, outputHash: result.outputHash, reasonInputHash: params.reason ? sha256(params.reason) : undefined, localOnly: true, networkEnabled: false, bodyStored: false, promptBodiesStored: false, outputBodiesStored: false, generatedAt: new Date().toISOString() });
       const ok = result.status === "reply" || result.status === "completed" || result.status === "waiting" || result.status === "delivered";
       const passiveWaitSuffix = result.status === "waiting" ? " · idle/passive wait: no follow-up turn queued; stop if no other action is actionable" : "";
-      return { content: [{ type: "text", text: ok ? `zpeer_ask ${result.status}: @${result.targetAlias ?? targetAlias}${result.outputHash ? ` outputHash=${result.outputHash}` : ""}${passiveWaitSuffix}` : `zpeer_ask ${result.status}: ${result.reason ?? "see metadata"}` }], details: { schema: "zob.zpeer-ask-result.v1", mode, ...result } };
+      const transientReplyText = (result.status === "reply" || result.status === "completed") && result.transientResponse
+        ? `\n\nTransient ZPeer reply (not stored in .pi/coms):\n${result.transientResponse}`
+        : "";
+      return { content: [{ type: "text", text: ok ? `zpeer_ask ${result.status}: @${result.targetAlias ?? targetAlias}${result.outputHash ? ` outputHash=${result.outputHash}` : ""}${passiveWaitSuffix}${transientReplyText}` : `zpeer_ask ${result.status}: ${result.reason ?? "see metadata"}` }], details: { schema: "zob.zpeer-ask-result.v1", mode, ...result } };
     },
   });
 

package/.pi/extensions/zob-harness/src/runtime/tools-context.ts

@@ -4,13 +4,13 @@ import {
   ContextReadinessParams,
   ContextScopeValidateParams,
   ContextWritebackProposalParams,
-} from "../schemas.js";
+} from "./schemas.js";
 import {
   buildContextGbrainReadinessAudit,
   buildDefaultContextScope,
   validateContextScope,
   writeContextWritebackProposal,
-} from "../context-gbrain.js";
+} from "../domains/context/context-gbrain.js";
 
 export function registerContextTools(pi: ExtensionAPI): void {
   pi.registerTool({

package/.pi/extensions/zob-harness/src/runtime/tools-delegation.ts

@@ -4,14 +4,14 @@ import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-a
 import { Text } from "@earendil-works/pi-tui";
 
 import type { AgentScope, ChildResult, ChildStopCondition, ChildThinkingLevel, DelegationDetails, DelegationFailureKind } from "../types.js";
-import { AwaitDelegationRunParams, DelegateParams, DelegateTaskParams, DelegationCatalogParams, DelegationRunParams } from "../schemas.js";
-import { discoverAgents, formatAgentList } from "../agents.js";
-import { applyTodoSplitRequest, extractTodoClaimFromText, extractTodoClaimValidationFromText, extractTodoSplitRequestFromText, isActionableTodoClaimValidation, isActionableTodoSplitRequest, linkGoalTodoDelegation, recordGoalTodoClaimValidationResult, requestGoalTodoClaimValidation, resolveGoalTodoReference, returnGoalTodoClaim, type GoalTodoNode } from "../goal-todos.js";
-import { isFailed, mapWithConcurrency, runChildAgent, validateChildThinkingOverride } from "../child-runner.js";
-import { classifyChildStopCondition, classifyDelegationChronicleCompletion, outputHasEvidenceMarker } from "../chronicle.js";
-import { validateExplicitModelOverride } from "../model-availability.js";
-import { applyChildGates, getOutputContractDefinitions, inferOutputContract, listOutputContracts, validateOutputContractId } from "../output-contracts.js";
-import { captureZcommitChildDirtySnapshot, diffZcommitChildDirtySnapshots, type ZcommitChildChangedPathRef } from "../git-ops.js";
+import { AwaitDelegationRunParams, DelegateParams, DelegateTaskParams, DelegationCatalogParams, DelegationRunParams } from "./schemas.js";
+import { discoverAgents, formatAgentList } from "../domains/delegation/agents.js";
+import { applyTodoSplitRequest, extractTodoClaimFromText, extractTodoClaimValidationFromText, extractTodoSplitRequestFromText, isActionableTodoClaimValidation, isActionableTodoSplitRequest, linkGoalTodoDelegation, recordGoalTodoClaimValidationResult, requestGoalTodoClaimValidation, resolveGoalTodoReference, returnGoalTodoClaim, type GoalTodoNode } from "../domains/goal/goal-todos.js";
+import { isFailed, mapWithConcurrency, runChildAgent, validateChildThinkingOverride } from "../domains/delegation/child-runner.js";
+import { classifyChildStopCondition, classifyDelegationChronicleCompletion, outputHasEvidenceMarker } from "../domains/telemetry/chronicle.js";
+import { validateExplicitModelOverride } from "../domains/models/model-availability.js";
+import { applyChildGates, getOutputContractDefinitions, inferOutputContract, listOutputContracts, validateOutputContractId } from "../domains/delegation/output-contracts.js";
+import { captureZcommitChildDirtySnapshot, diffZcommitChildDirtySnapshots, type ZcommitChildChangedPathRef } from "../domains/git/git-ops.js";
 import {
   parseToolList,
   resolveChildCwd,
@@ -21,11 +21,11 @@ import {
   validateForbiddenPathPolicy,
   validateSixPartContract,
   validateToolList,
-} from "../safety.js";
-import { usageEmpty, writeDelegationTelemetrySummary } from "../telemetry.js";
-import { capOutput, formatChildResultText } from "../utils/formatting.js";
-import { sha256 } from "../utils/hashing.js";
-import { newRunId } from "../utils/paths.js";
+} from "../domains/governance/safety.js";
+import { usageEmpty, writeDelegationTelemetrySummary } from "../domains/telemetry/telemetry.js";
+import { capOutput, formatChildResultText } from "../core/utils/formatting.js";
+import { sha256 } from "../core/utils/hashing.js";
+import { newRunId } from "../core/utils/paths.js";
 import {
   delegationDurationMs,
   delegationSignalBadge,

package/.pi/extensions/zob-harness/src/runtime/tools-factory.ts

@@ -2,25 +2,25 @@ import { existsSync, mkdirSync, unlinkSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
-import { buildZobLivePresenceSummary } from "../coms-v2/presence.js";
-import { readZobComsV2Policy } from "../coms-v2/policy.js";
-import { discoverAgents } from "../agents.js";
-import { evaluateStrictBudgetDispatchGate } from "../budget-policy.js";
-import { isFailed, runChildAgent } from "../child-runner.js";
-import { classifyChronicleCompletion, outputHasEvidenceMarker } from "../chronicle.js";
-import { buildAgenticFactoryNoMockFinalGate, factoryLedger, runFactoryRun } from "../factory/run.js";
-import { buildInitialAdaptiveDelegationGovernorState, buildParentDispatchContractForDecision, decideDelegationRequest, extractDelegationRequestsFromText, normalizeAdaptiveDelegationPolicy, updateGovernorState } from "../orchestration/adaptive-delegation.js";
-import { runFactoryQuarantineActivate, runFactoryQuarantineReview, runFactoryQuarantineVerifyActivation } from "../factory/quarantine.js";
-import { evaluateModelRoutingDispatchGate } from "../model-routing.js";
-import { applyChildGates, inferOutputContract, validateOutputContractId } from "../output-contracts.js";
-import { FactoryQuarantineActivateParams, FactoryQuarantineReviewParams, FactoryQuarantineVerifyActivationParams, FactoryRunParams } from "../schemas.js";
-import { factoryPhaseSentinelForMode, loadFactoryDefinition, loadFactoryInputManifest } from "../factory/validation.js";
-import { validateToolList } from "../safety.js";
-import { addUsage, usageEmpty, writeFactoryTelemetrySummary } from "../telemetry.js";
-import { sha256 } from "../utils/hashing.js";
-import { parseJsonFile } from "../utils/json.js";
-import { safeFileStem } from "../utils/paths.js";
-import { isRecord } from "../utils/records.js";
+import { buildZobLivePresenceSummary } from "../domains/coms/coms-v2/presence.js";
+import { readZobComsV2Policy } from "../domains/coms/coms-v2/policy.js";
+import { discoverAgents } from "../domains/delegation/agents.js";
+import { evaluateStrictBudgetDispatchGate } from "../domains/governance/budget-policy.js";
+import { isFailed, runChildAgent } from "../domains/delegation/child-runner.js";
+import { classifyChronicleCompletion, outputHasEvidenceMarker } from "../domains/telemetry/chronicle.js";
+import { buildAgenticFactoryNoMockFinalGate, factoryLedger, runFactoryRun } from "../domains/factory/run.js";
+import { buildInitialAdaptiveDelegationGovernorState, buildParentDispatchContractForDecision, decideDelegationRequest, extractDelegationRequestsFromText, normalizeAdaptiveDelegationPolicy, updateGovernorState } from "../domains/orchestration/adaptive-delegation.js";
+import { runFactoryQuarantineActivate, runFactoryQuarantineReview, runFactoryQuarantineVerifyActivation } from "../domains/factory/quarantine.js";
+import { evaluateModelRoutingDispatchGate } from "../domains/models/model-routing.js";
+import { applyChildGates, inferOutputContract, validateOutputContractId } from "../domains/delegation/output-contracts.js";
+import { FactoryQuarantineActivateParams, FactoryQuarantineReviewParams, FactoryQuarantineVerifyActivationParams, FactoryRunParams } from "./schemas.js";
+import { factoryPhaseSentinelForMode, loadFactoryDefinition, loadFactoryInputManifest } from "../domains/factory/validation.js";
+import { validateToolList } from "../domains/governance/safety.js";
+import { addUsage, usageEmpty, writeFactoryTelemetrySummary } from "../domains/telemetry/telemetry.js";
+import { sha256 } from "../core/utils/hashing.js";
+import { parseJsonFile } from "../core/utils/json.js";
+import { safeFileStem } from "../core/utils/paths.js";
+import { isRecord } from "../core/utils/records.js";
 import type { DelegationRequestProposal, GovernorDecision, ParentDispatchContract } from "../types.js";
 import type { HarnessRuntimeState } from "./state.js";
 import { strictGoalSpecErrors } from "./state.js";

package/.pi/extensions/zob-harness/src/runtime/tools-goal-room.ts

@@ -1,8 +1,8 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
-import { appendGoalRoomMessage, listGoalRoomMessages } from "../goal-room.js";
-import { ZobGoalRoomListParams, ZobGoalRoomSendParams } from "../schemas.js";
-import { loadTeamDefinition, validateTeamDefinition } from "../topology/teams.js";
+import { appendGoalRoomMessage, listGoalRoomMessages } from "../domains/goal/goal-room.js";
+import { ZobGoalRoomListParams, ZobGoalRoomSendParams } from "./schemas.js";
+import { loadTeamDefinition, validateTeamDefinition } from "../domains/topology/teams.js";
 import type { TeamDefinition } from "../types.js";
 
 export function registerGoalRoomTools(pi: ExtensionAPI): void {

package/.pi/extensions/zob-harness/src/runtime/tools-governed-requests.ts

@@ -1,8 +1,8 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
-import { appendGovernedRequestsToGoalRoom, extractGovernedRequestsFromText, governedRequestBodyFreeViolations } from "../governed-requests.js";
-import { GovernedRequestExtractParams } from "../schemas.js";
-import { loadTeamDefinition, validateTeamDefinition } from "../topology/teams.js";
+import { appendGovernedRequestsToGoalRoom, extractGovernedRequestsFromText, governedRequestBodyFreeViolations } from "../domains/governance/governed-requests.js";
+import { GovernedRequestExtractParams } from "./schemas.js";
+import { loadTeamDefinition, validateTeamDefinition } from "../domains/topology/teams.js";
 
 export function registerGovernedRequestTools(pi: ExtensionAPI): void {
   pi.registerTool({

package/.pi/extensions/zob-harness/src/runtime/tools-merge-queue.ts

@@ -1,8 +1,8 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
-import { decideMergeCandidate, listMergeQueue, mergeQueueBodyFreeViolations, submitMergeCandidate } from "../merge-queue.js";
-import { MergeCandidateSubmitParams, MergeQueueDecideParams, MergeQueueListParams } from "../schemas.js";
-import { loadTeamDefinition, validateTeamDefinition } from "../topology/teams.js";
+import { decideMergeCandidate, listMergeQueue, mergeQueueBodyFreeViolations, submitMergeCandidate } from "../domains/governance/merge-queue.js";
+import { MergeCandidateSubmitParams, MergeQueueDecideParams, MergeQueueListParams } from "./schemas.js";
+import { loadTeamDefinition, validateTeamDefinition } from "../domains/topology/teams.js";
 
 export function registerMergeQueueTools(pi: ExtensionAPI): void {
   pi.registerTool({

package/.pi/extensions/zob-harness/src/runtime/tools-mission-control.ts

@@ -4,14 +4,14 @@ import {
   MissionControlProposeCommandParams,
   MissionControlSnapshotParams,
   ZobComsReadinessParams,
-} from "../schemas.js";
+} from "./schemas.js";
 import type { TeamDefinition } from "../types.js";
 import {
   buildMissionControlSnapshot,
   buildZobCommunicationReadinessAudit,
   writeMissionControlCommandProposal,
-} from "../mission-control.js";
-import { loadTeamDefinition, validateTeamDefinition } from "../topology/teams.js";
+} from "../domains/coms/mission-control.js";
+import { loadTeamDefinition, validateTeamDefinition } from "../domains/topology/teams.js";
 
 function loadValidTeam(repoRoot: string, teamName: string | undefined): { definition?: TeamDefinition; errors: string[] } {
   const team = loadTeamDefinition(repoRoot, teamName ?? "zob-core");

package/.pi/extensions/zob-harness/src/runtime/tools-orchestration.ts

@@ -1,14 +1,14 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
-import { buildZobLivePresenceSummary } from "../coms-v2/presence.js";
-import { readZobComsV2Policy } from "../coms-v2/policy.js";
-import { OrchestrateRunParams, ChainRunParams } from "../schemas.js";
-import { createSupervisedReadonlyDispatcher } from "../child-runner.js";
-import { runOrchestrateRun } from "../orchestration/run.js";
-import { runSupervisedReadonlyOrchestration } from "../orchestration/supervised-readonly.js";
-import { runChainPlanOnly } from "../topology/chains.js";
-import { sha256 } from "../utils/hashing.js";
-import { isRecord } from "../utils/records.js";
+import { buildZobLivePresenceSummary } from "../domains/coms/coms-v2/presence.js";
+import { readZobComsV2Policy } from "../domains/coms/coms-v2/policy.js";
+import { OrchestrateRunParams, ChainRunParams } from "./schemas.js";
+import { createSupervisedReadonlyDispatcher } from "../domains/delegation/child-runner.js";
+import { runOrchestrateRun } from "../domains/orchestration/run.js";
+import { runSupervisedReadonlyOrchestration } from "../domains/orchestration/supervised-readonly.js";
+import { runChainPlanOnly } from "../domains/topology/chains.js";
+import { sha256 } from "../core/utils/hashing.js";
+import { isRecord } from "../core/utils/records.js";
 import type { HarnessRuntimeState } from "./state.js";
 import { strictGoalSpecErrors } from "./state.js";
 

package/.pi/extensions/zob-harness/src/runtime/tools-project-dna.ts

@@ -1,7 +1,7 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
-import { buildProjectDnaAgenticPlan, buildProjectDnaFederatedQueryResult, buildProjectDnaQueryResult, buildProjectDnaReadinessAudit, writeProjectDnaWritebackProposal } from "../project-dna.js";
-import { ProjectDnaFederatedQueryParams, ProjectDnaPlanWorkflowParams, ProjectDnaQueryParams, ProjectDnaReadinessParams, ProjectDnaWritebackProposalParams } from "../schemas.js";
+import { buildProjectDnaAgenticPlan, buildProjectDnaFederatedQueryResult, buildProjectDnaQueryResult, buildProjectDnaReadinessAudit, writeProjectDnaWritebackProposal } from "../domains/project-dna/project-dna.js";
+import { ProjectDnaFederatedQueryParams, ProjectDnaPlanWorkflowParams, ProjectDnaQueryParams, ProjectDnaReadinessParams, ProjectDnaWritebackProposalParams } from "./schemas.js";
 
 export function registerProjectDnaTools(pi: ExtensionAPI): void {
   pi.registerTool({

package/.pi/extensions/zob-harness/src/runtime/tools-worker-pool.ts

@@ -1,8 +1,8 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
-import { createWorkerPoolOwnerDecision, createWorkerPoolOwnerRequest, createWorkerPoolPlan, listWorkerPoolPlans, workerPoolBodyFreeViolations } from "../worker-pool.js";
-import { WorkerPoolOwnerDecisionParams, WorkerPoolOwnerRequestParams, WorkerPoolPlanParams, WorkerPoolStatusParams } from "../schemas.js";
-import { loadTeamDefinition, validateTeamDefinition } from "../topology/teams.js";
+import { createWorkerPoolOwnerDecision, createWorkerPoolOwnerRequest, createWorkerPoolPlan, listWorkerPoolPlans, workerPoolBodyFreeViolations } from "../domains/governance/worker-pool.js";
+import { WorkerPoolOwnerDecisionParams, WorkerPoolOwnerRequestParams, WorkerPoolPlanParams, WorkerPoolStatusParams } from "./schemas.js";
+import { loadTeamDefinition, validateTeamDefinition } from "../domains/topology/teams.js";
 
 export function registerWorkerPoolTools(pi: ExtensionAPI): void {
   pi.registerTool({

package/.pi/extensions/zob-harness/src/runtime/tools-workspace-claims.ts

@@ -1,8 +1,8 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
-import { createWorkspaceClaim, listWorkspaceClaims, releaseWorkspaceClaim, workspaceClaimBodyFreeViolations } from "../workspace-claims.js";
-import { WorkspaceClaimParams, WorkspaceClaimsListParams, WorkspaceReleaseParams } from "../schemas.js";
-import { loadTeamDefinition, validateTeamDefinition } from "../topology/teams.js";
+import { createWorkspaceClaim, listWorkspaceClaims, releaseWorkspaceClaim, workspaceClaimBodyFreeViolations } from "../domains/governance/workspace-claims.js";
+import { WorkspaceClaimParams, WorkspaceClaimsListParams, WorkspaceReleaseParams } from "./schemas.js";
+import { loadTeamDefinition, validateTeamDefinition } from "../domains/topology/teams.js";
 
 export function registerWorkspaceClaimTools(pi: ExtensionAPI): void {
   pi.registerTool({