zob-harness 0.2.0 → 0.3.1

package/.pi/extensions/zob-harness/src/{topology → domains/topology}/chains.ts

@@ -1,16 +1,16 @@
 import { appendFileSync, existsSync, mkdirSync, unlinkSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 
-import { loadProjectAgents } from "../agents.js";
-import { BLOCKED_CHAIN_TOOLS, READ_ONLY_CHAIN_TOOLS } from "../constants.js";
-import { validateOutputContractId } from "../output-contracts.js";
-import { validateToolList } from "../safety.js";
-import type { ChainDefinition, ChainRunInput, ChainRunResult, ChainStepDefinition } from "../types.js";
-import { sha256 } from "../utils/hashing.js";
-import { parseJsonFile } from "../utils/json.js";
-import { isSafeArtifactName, safeFileStem, safeRunId } from "../utils/paths.js";
-import { isRecord } from "../utils/records.js";
-import { listZobResourceJsonStems, readableZobResourcePath } from "../utils/resources.js";
+import { loadProjectAgents } from "../delegation/agents.js";
+import { BLOCKED_CHAIN_TOOLS, READ_ONLY_CHAIN_TOOLS } from "../../core/constants.js";
+import { validateOutputContractId } from "../delegation/output-contracts.js";
+import { validateToolList } from "../governance/safety.js";
+import type { ChainDefinition, ChainRunInput, ChainRunResult, ChainStepDefinition } from "../../types.js";
+import { sha256 } from "../../core/utils/hashing.js";
+import { parseJsonFile } from "../../core/utils/json.js";
+import { isSafeArtifactName, safeFileStem, safeRunId } from "../../core/utils/paths.js";
+import { isRecord } from "../../core/utils/records.js";
+import { listZobResourceJsonStems, readableZobResourcePath } from "../../core/utils/resources.js";
 import { isStringArray } from "./teams.js";
 
 function chainsDir(repoRoot: string): string {

package/.pi/extensions/zob-harness/src/{topology → domains/topology}/coms.ts

@@ -1,9 +1,9 @@
 import { appendFileSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
 
-import type { TeamDefinition, ZobComsMessageInput } from "../types.js";
-import { sha256 } from "../utils/hashing.js";
-import { readJsonl } from "../utils/json.js";
+import type { TeamDefinition, ZobComsMessageInput } from "../../types.js";
+import { sha256 } from "../../core/utils/hashing.js";
+import { readJsonl } from "../../core/utils/json.js";
 
 function comsDir(repoRoot: string): string {
   return join(repoRoot, ".pi", "coms");

package/.pi/extensions/zob-harness/src/{topology → domains/topology}/orchestration-profiles.ts

@@ -1,15 +1,15 @@
 import { existsSync } from "node:fs";
 import { join } from "node:path";
 
-import { loadProjectAgents } from "../agents.js";
+import { loadProjectAgents } from "../delegation/agents.js";
 import { normalizeAdaptiveDelegationPolicy, validateAdaptiveDelegationPolicy } from "../orchestration/adaptive-delegation.js";
-import { validateOutputContractId } from "../output-contracts.js";
-import { validateAllowedPathPolicy, validateDelegateTaskWriteScope, validateForbiddenPathPolicy, validateToolList } from "../safety.js";
-import type { OrchestrateRunInput, OrchestrationProfileDefinition, OrchestrationProfilePhase, OrchestrationProfileRole, TeamDefinition } from "../types.js";
-import { parseJsonFile } from "../utils/json.js";
-import { isSafeArtifactName, safeFileStem } from "../utils/paths.js";
-import { isRecord } from "../utils/records.js";
-import { listZobResourceJsonStems, readableZobResourcePath } from "../utils/resources.js";
+import { validateOutputContractId } from "../delegation/output-contracts.js";
+import { validateAllowedPathPolicy, validateDelegateTaskWriteScope, validateForbiddenPathPolicy, validateToolList } from "../governance/safety.js";
+import type { OrchestrateRunInput, OrchestrationProfileDefinition, OrchestrationProfilePhase, OrchestrationProfileRole, TeamDefinition } from "../../types.js";
+import { parseJsonFile } from "../../core/utils/json.js";
+import { isSafeArtifactName, safeFileStem } from "../../core/utils/paths.js";
+import { isRecord } from "../../core/utils/records.js";
+import { listZobResourceJsonStems, readableZobResourcePath } from "../../core/utils/resources.js";
 import { isStringArray, loadTeamDefinition, validateTeamDefinition } from "./teams.js";
 
 function orchestrationProfilesDir(repoRoot: string): string {

package/.pi/extensions/zob-harness/src/{topology → domains/topology}/teams.ts

@@ -1,14 +1,14 @@
 import { existsSync } from "node:fs";
 import { join } from "node:path";
 
-import { loadProjectAgents } from "../agents.js";
-import { validateOutputContractId } from "../output-contracts.js";
-import { validateToolList } from "../safety.js";
-import type { HarnessAgent, TeamDefinition, TeamLead, TeamRoleBase, TeamWorker } from "../types.js";
-import { parseJsonFile } from "../utils/json.js";
-import { isSafeArtifactName, safeFileStem } from "../utils/paths.js";
-import { isRecord } from "../utils/records.js";
-import { readableZobResourcePath } from "../utils/resources.js";
+import { loadProjectAgents } from "../delegation/agents.js";
+import { validateOutputContractId } from "../delegation/output-contracts.js";
+import { validateToolList } from "../governance/safety.js";
+import type { HarnessAgent, TeamDefinition, TeamLead, TeamRoleBase, TeamWorker } from "../../types.js";
+import { parseJsonFile } from "../../core/utils/json.js";
+import { isSafeArtifactName, safeFileStem } from "../../core/utils/paths.js";
+import { isRecord } from "../../core/utils/records.js";
+import { readableZobResourcePath } from "../../core/utils/resources.js";
 
 function isStringArray(value: unknown): value is string[] {
   return Array.isArray(value) && value.every((item) => typeof item === "string");

package/.pi/extensions/zob-harness/src/runtime/adaptive-zmode.ts

@@ -1,6 +1,6 @@
 import type { ModeName } from "../types.js";
-import { sha256 } from "../utils/hashing.js";
-import { isRecord } from "../utils/records.js";
+import { sha256 } from "../core/utils/hashing.js";
+import { isRecord } from "../core/utils/records.js";
 
 export type AdaptiveZmodeAlias = "orchestrator";
 

package/.pi/extensions/zob-harness/src/runtime/auto-compaction.ts

@@ -2,8 +2,8 @@ import { randomUUID } from "node:crypto";
 import type { CompactionResult, ExtensionAPI, ExtensionContext, SessionEntry } from "@earendil-works/pi-coding-agent";
 import { compact, estimateTokens, findCutPoint } from "@earendil-works/pi-coding-agent";
 
-import { sha256 } from "../utils/hashing.js";
-import { isRecord } from "../utils/records.js";
+import { sha256 } from "../core/utils/hashing.js";
+import { isRecord } from "../core/utils/records.js";
 import { buildZobCompactionInstructions, withZobCompactionDetails, ZOB_COMPACTION_TARGET_TOKENS, type ZobCompactionDetails } from "./compaction-policy.js";
 import type { HarnessRuntimeState } from "./state.js";
 

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

@@ -1,26 +1,26 @@
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import type { AutocompleteItem } from "@earendil-works/pi-tui";
 
-import { MODE_PROMPTS } from "../constants.js";
+import { MODE_PROMPTS } from "../core/constants.js";
 import type { ModeName, QueueTickResult } from "../types.js";
-import { discoverAgents, formatAgentList } from "../agents.js";
-import { buildComputePreview, resolveComputeProfile, type ComputeRequestedProfile } from "../compute-profile.js";
-import { buildComputeWorkflowShape } from "../compute-workflow-shape.js";
-import { buildDaemonRuntimeState, buildDaemonTickPlan, type DaemonRuntimeState, type DaemonTickPlan } from "../daemon-runtime.js";
-import { runQueueDaemonTick } from "../queue.js";
-import { buildProjectDnaAgenticPlan, buildProjectDnaQueryResult, buildProjectDnaReadinessAudit } from "../project-dna.js";
-import { formatZagentList, formatZteamList, listZagentManifests, listZteamManifests, loadZagentManifest, loadZteamManifest, normalizeZagentRoomBindings, readZagentPrompt, type ZAgentManifest, type ZAgentRoomBinding, type ZTeamAgentManifest, type ZTeamManifest, type ZTeamMemberManifest } from "../zagents.js";
+import { discoverAgents, formatAgentList } from "../domains/delegation/agents.js";
+import { buildComputePreview, resolveComputeProfile, type ComputeRequestedProfile } from "../domains/compute/compute-profile.js";
+import { buildComputeWorkflowShape } from "../domains/compute/compute-workflow-shape.js";
+import { buildDaemonRuntimeState, buildDaemonTickPlan, type DaemonRuntimeState, type DaemonTickPlan } from "../domains/autonomy/daemon-runtime.js";
+import { runQueueDaemonTick } from "../domains/telemetry/queue.js";
+import { buildProjectDnaAgenticPlan, buildProjectDnaQueryResult, buildProjectDnaReadinessAudit } from "../domains/project-dna/project-dna.js";
+import { formatZagentList, formatZteamList, listZagentManifests, listZteamManifests, loadZagentManifest, loadZteamManifest, normalizeZagentRoomBindings, readZagentPrompt, resolveZagentRuntimeRoomBindings, type ZAgentManifest, type ZAgentRoomBinding, type ZTeamAgentManifest, type ZTeamManifest, type ZTeamMemberManifest } from "../domains/coms/zagents.js";
 import { resolveAdaptiveZmodeEntrypoint, renderAdaptiveZmodeTemplate } from "./adaptive-zmode.js";
 import { handleZcompactCommand } from "./auto-compaction.js";
-import { sha256 } from "../utils/hashing.js";
-import { buildZcommitPlan, formatZcommitPlan, formatZcommitStatus, readZcommitPolicy, runGovernedZcommitAdopt, runGovernedZcommitCommit, runGovernedZcommitPush, type ZcommitAdoptResult, type ZcommitCommandResult, type ZcommitOwnedPathRef, type ZcommitToggleState } from "../git-ops.js";
-import { clearZpeerNewCarryoverProfile, writeZpeerLocalProfileFromPeer } from "../coms-v2/zpeer-profile.js";
-import { buildZpeerRoomSummary, changeZpeerAlias, changeZpeerRoom, clearZpeerRoom, joinZpeerRoom, leaveZpeerRoom, peerAliasInRoom, refreshZpeerSelf, sendZpeerPrompt, useZpeerRoom, zpeerMembershipsForPeer, type ZpeerSendMode } from "../coms-v2/zpeer.js";
+import { sha256 } from "../core/utils/hashing.js";
+import { buildZcommitPlan, formatZcommitPlan, formatZcommitStatus, readZcommitPolicy, runGovernedZcommitAdopt, runGovernedZcommitCommit, runGovernedZcommitPush, type ZcommitAdoptResult, type ZcommitCommandResult, type ZcommitOwnedPathRef, type ZcommitToggleState } from "../domains/git/git-ops.js";
+import { clearZpeerNewCarryoverProfile, writeZpeerLocalProfileFromPeer } from "../domains/coms/coms-v2/zpeer-profile.js";
+import { buildZpeerRoomSummary, changeZpeerAlias, changeZpeerRoom, clearZpeerRoom, joinZpeerRoom, leaveZpeerRoom, peerAliasInRoom, refreshZpeerSelf, sendZpeerPrompt, useZpeerRoom, zpeerMembershipsForPeer, type ZpeerSendMode } from "../domains/coms/coms-v2/zpeer.js";
 import { markZpeerNewHardResetPending } from "./events.js";
-import { parseBillableJobIntake, validateBillableJobIntake } from "../goal.js";
-import { handleGoalCommand, handleGoalGateCommand, pauseRuntimeGoalForStop } from "../goal-runtime.js";
-import { formatRuleResolution, resolveRuleProfile } from "../rules.js";
-import { formatContractTemplate } from "../safety.js";
+import { parseBillableJobIntake, validateBillableJobIntake } from "../domains/goal/goal.js";
+import { handleGoalCommand, handleGoalGateCommand, pauseRuntimeGoalForStop } from "./goal-runtime.js";
+import { formatRuleResolution, resolveRuleProfile } from "../domains/governance/rules.js";
+import { formatContractTemplate } from "../domains/governance/safety.js";
 import { showDelegationOverlay } from "./delegation-overlay.js";
 import { finishDelegationRun } from "./delegation-monitor.js";
 import { showGoalTodoOverlay } from "./goal-todo-overlay.js";
@@ -33,7 +33,7 @@ import {
   scoreMissionReadiness,
   toAutonomyStateLedgerEntry,
   toMissionReadinessLedgerEntry,
-} from "../interactive-autonomy.js";
+} from "../domains/autonomy/interactive-autonomy.js";
 import { applyMode, renderHarnessWidget } from "./widget.js";
 
 const COMPUTE_PROFILES = ["auto", "low", "medium", "high", "xhigh", "max"] as const;
@@ -598,6 +598,7 @@ function formatZagentShow(loaded: ReturnType<typeof loadZagentManifest>): string
     loaded.manifest.team ? `team: ${loaded.manifest.team}` : undefined,
     loaded.manifest.role ? `role: ${loaded.manifest.role}` : undefined,
     loaded.manifest.alias ? `alias: @${loaded.manifest.alias}` : undefined,
+    loaded.manifest.defaultMode ? `defaultMode: ${loaded.manifest.defaultMode}` : undefined,
     rooms.length ? `rooms: ${rooms.map((room) => `${room.id}${room.alias ? `@${room.alias}` : ""}${room.active ? "*" : ""}`).join(", ")}` : "rooms: none",
     loaded.manifest.promptRef ? `promptRef: ${loaded.manifest.promptRef}` : "promptRef: none",
     loaded.promptPath ? `promptPath: ${loaded.promptPath}` : undefined,
@@ -627,7 +628,7 @@ function normalizeZpeerRole(role: string | undefined): "member" | "bridge" | "ob
 
 async function applyZagentToZpeer(repoRoot: string, peer: NonNullable<HarnessRuntimeState["zobLive"]["peerCard"]>, manifest: ZAgentManifest): Promise<{ ok: true; peer: NonNullable<HarnessRuntimeState["zobLive"]["peerCard"]> } | { ok: false; reason: string; peer: NonNullable<HarnessRuntimeState["zobLive"]["peerCard"]> }> {
   let current = refreshZpeerSelf(repoRoot, peer);
-  const rooms = normalizeZagentRoomBindings(manifest.rooms, manifest.defaultRoom, manifest.activeRoom);
+  const rooms = resolveZagentRuntimeRoomBindings(repoRoot, manifest).rooms;
   if (rooms.length === 0 && manifest.alias) {
     const changed = await changeZpeerAlias(repoRoot, current, manifest.alias);
     if (!changed.ok) return { ok: false, reason: changed.reason, peer: current };
@@ -663,25 +664,44 @@ function zteamMembers(team: ZTeamManifest): Array<{ id: string; alias?: string;
   }));
 }
 
-function zteamLaunchPlanText(team: ZTeamManifest): { text: string; roomIds: string[]; agentIds: string[] } {
+function safeLaunchPlanModel(value: string | undefined): string | undefined {
+  const trimmed = value?.trim();
+  if (!trimmed || trimmed.length > 160) return undefined;
+  if (trimmed.includes("\0") || trimmed.includes("\n") || trimmed.includes("\r") || trimmed.includes("..")) return undefined;
+  if (trimmed.startsWith("/") || trimmed.startsWith("~")) return undefined;
+  return /^[a-zA-Z0-9._:/+@-]+$/.test(trimmed) ? trimmed : undefined;
+}
+
+function zteamLaunchPlanText(repoRoot: string, team: ZTeamManifest): { text: string; roomIds: string[]; agentIds: string[]; modelIds: string[]; defaultModes: string[] } {
   const teamRooms = normalizeZagentRoomBindings(team.rooms, team.defaultRoom, team.activeRoom).map((room) => room.id);
   const members = zteamMembers(team);
   const roomIds = [...new Set([...teamRooms, ...members.flatMap((member) => (member.rooms ?? []).map((room) => room.id))])];
   const agentIds = members.map((member) => member.id);
+  const loadedAgents = members.map((member) => ({ member, loaded: loadZagentManifest(repoRoot, member.id) }));
+  const modelIds = [...new Set(loadedAgents.map(({ loaded }) => safeLaunchPlanModel(loaded.manifest.model)).filter((model): model is string => Boolean(model)))];
+  const defaultModes = [...new Set(loadedAgents.map(({ loaded }) => loaded.manifest.defaultMode).filter((mode): mode is ModeName => Boolean(mode)))];
   const lines = [
     `# ZTeam launch-plan: ${team.id}`,
     "No processes spawned. Copy/paste each command in a separate terminal when approved.",
     "",
-    ...members.map((member) => {
+    ...loadedAgents.map(({ member, loaded }) => {
+      const rawModel = loaded.manifest.model;
+      const model = safeLaunchPlanModel(rawModel);
+      const defaultMode = loaded.manifest.defaultMode;
       const rooms = (member.rooms ?? []).map((room) => `${room.id}${room.active ? "*" : ""}`).join(", ") || teamRooms.join(", ") || "default";
       const alias = member.alias ? ` alias=@${member.alias}` : "";
-      return `ZOB_ZAGENT_ID=${member.id} pi    # expected_rooms=${rooms}${alias}`;
+      const modelArg = model ? ` --model ${model}` : "";
+      const modelNote = rawModel ? (model ? ` model=${model}` : " model=invalid_omitted") : "";
+      const modeNote = defaultMode ? ` defaultMode=${defaultMode}` : "";
+      return `ZOB_ZAGENT_ID=${member.id} pi${modelArg}    # expected_rooms=${rooms}${alias}${modelNote}${modeNote}`;
     }),
     "",
     `Expected rooms: ${roomIds.join(", ") || "default"}`,
+    modelIds.length ? `Models: ${modelIds.join(", ")}` : "Models: default Pi model unless each ZAgent manifest sets a safe model",
+    defaultModes.length ? `Default modes: ${defaultModes.join(", ")}` : "Default modes: restored/current ZOB mode unless each ZAgent manifest sets defaultMode",
     "After each session starts, run /zagent use <id> to bind its ZPeer alias/rooms.",
   ];
-  return { text: lines.join("\n"), roomIds, agentIds };
+  return { text: lines.join("\n"), roomIds, agentIds, modelIds, defaultModes };
 }
 
 function delegationArgumentCompletions(state: HarnessRuntimeState, prefix: string): AutocompleteItem[] | null {
@@ -874,11 +894,13 @@ export function registerHarnessCommands(pi: ExtensionAPI, state: HarnessRuntimeS
         }
         const loaded = loadZagentManifest(ctx.cwd, id);
         const prompt = readZagentPrompt(ctx.cwd, loaded.manifest.promptRef);
-        const rooms = normalizeZagentRoomBindings(loaded.manifest.rooms, loaded.manifest.defaultRoom, loaded.manifest.activeRoom);
+        const resolved = resolveZagentRuntimeRoomBindings(ctx.cwd, loaded.manifest);
+        const rooms = resolved.rooms;
         const errors = [...loaded.errors, ...prompt.errors];
         state.zagent = {
           id: loaded.manifest.id,
-          team: loaded.manifest.team,
+          team: loaded.manifest.team ?? resolved.teamIds[0],
+          teams: resolved.teamIds,
           role: loaded.manifest.role,
           alias: loaded.manifest.alias,
           description: loaded.manifest.description,
@@ -967,11 +989,11 @@ export function registerHarnessCommands(pi: ExtensionAPI, state: HarnessRuntimeS
           return;
         }
         const loaded = loadZteamManifest(ctx.cwd, id);
-        const plan = zteamLaunchPlanText(loaded.manifest);
+        const plan = zteamLaunchPlanText(ctx.cwd, loaded.manifest);
         pi.appendEntry("zob-zagent", zagentLedgerEntry("zteam_launch_plan", { teamId: loaded.manifest.id, status: loaded.errors.length === 0 ? "ok" : "blocked", roomIds: plan.roomIds, path: loaded.path, errors: loaded.errors }));
         renderHarnessWidget(pi, state, ctx);
-        void pi.sendMessage({ customType: "zob-zteam-launch-plan", content: loaded.errors.length ? `${plan.text}\n\nBlocked manifest errors:\n- ${loaded.errors.join("\n- ")}` : plan.text, display: true, details: { id: loaded.manifest.id, agentIdHashes: plan.agentIds.map((agentId) => sha256(agentId)), roomIdHashes: plan.roomIds.map((roomId) => sha256(roomId)), bodyStored: false } }, { triggerTurn: false });
-        ctx.ui.notify(`zteam ${loaded.manifest.id} launch-plan printed; spawn count=0; expectedRooms=${plan.roomIds.join(",") || "default"}`, loaded.errors.length === 0 ? "info" : "warning");
+        void pi.sendMessage({ customType: "zob-zteam-launch-plan", content: loaded.errors.length ? `${plan.text}\n\nBlocked manifest errors:\n- ${loaded.errors.join("\n- ")}` : plan.text, display: true, details: { id: loaded.manifest.id, agentIdHashes: plan.agentIds.map((agentId) => sha256(agentId)), roomIdHashes: plan.roomIds.map((roomId) => sha256(roomId)), modelIdHashes: plan.modelIds.map((modelId) => sha256(modelId)), defaultModeHashes: plan.defaultModes.map((mode) => sha256(mode)), bodyStored: false } }, { triggerTurn: false });
+        ctx.ui.notify(`zteam ${loaded.manifest.id} launch-plan printed; spawn count=0; expectedRooms=${plan.roomIds.join(",") || "default"}; models=${plan.modelIds.length || "default"}; defaultModes=${plan.defaultModes.length || "current"}`, loaded.errors.length === 0 ? "info" : "warning");
         return;
       }
       ctx.ui.notify("Usage: /zteam list | /zteam show <id> | /zteam launch-plan <id>", "warning");
@@ -1010,9 +1032,9 @@ export function registerHarnessCommands(pi: ExtensionAPI, state: HarnessRuntimeS
         });
         emitZpeerEvent({ kind: "status", roomId: summary.roomId, fromAlias: summary.selfAlias, status: `online=${summary.online}/${summary.peerCount}`, reason: `stale=${summary.stale} offline=${summary.offline}` });
         renderHarnessWidget(pi, state, ctx);
-        const availableAliases = summary.aliases.filter((alias) => alias !== summary.selfAlias).map((alias) => `@${alias}`).join(", ") || "none";
+        const availableAliases = summary.onlineAliases.filter((alias) => alias !== summary.selfAlias).map((alias) => `@${alias}`).join(", ") || "none";
         const unavailable = summary.stale + summary.offline;
-        ctx.ui.notify(`zpeer room=${summary.roomId} memberships=${summary.membershipCount ?? zpeerMembershipsForPeer(self).length} self=@${summary.selfAlias ?? "?"} onlinePeers=${Math.max(0, summary.online - 1)} unavailable=${unavailable} peers=${availableAliases} · usage: /zpeer @alias <prompt> | /zpeer in <room> @alias <prompt> · safety: local-only/hash-only/bodyStored=false`, "info");
+        ctx.ui.notify(`zpeer room=${summary.roomId} memberships=${summary.membershipCount ?? zpeerMembershipsForPeer(self).length} self=@${summary.selfAlias ?? "?"} onlinePeers=${Math.max(0, summary.online - 1)} unavailable=${unavailable} livePeers=${availableAliases} · usage: /zpeer @alias <prompt> | /zpeer in <room> @alias <prompt> · safety: local-only/hash-only/bodyStored=false`, "info");
         return;
       }
       const parts = trimmed.split(/\s+/);

package/.pi/extensions/zob-harness/src/runtime/compaction-policy.ts

@@ -1,7 +1,7 @@
 import type { CompactionResult } from "@earendil-works/pi-coding-agent";
 
-import { goalTodoCompletionDiagnostics, summarizeGoalTodos } from "../goal-todos.js";
-import { sha256 } from "../utils/hashing.js";
+import { goalTodoCompletionDiagnostics, summarizeGoalTodos } from "../domains/goal/goal-todos.js";
+import { sha256 } from "../core/utils/hashing.js";
 import type { HarnessRuntimeState } from "./state.js";
 
 export const ZOB_COMPACTION_ENTRY_TYPE = "zob-compaction";

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

@@ -5,7 +5,7 @@ import { Markdown, truncateToWidth, visibleWidth, type MarkdownTheme } from "@ea
 
 import { delegationDurationMs, delegationSignalBadge, delegationSignalColor, formatDelegationContextLabel, formatDelegationCostLabel, formatDelegationModelLabel, formatDelegationSignalBadge, formatDuration, statusIcon, type DelegationRunView } from "./delegation-monitor.js";
 import { sanitizeDelegationText } from "./delegation-markdown.js";
-import { isRecord } from "../utils/records.js";
+import { isRecord } from "../core/utils/records.js";
 
 const FEED_MAX_BYTES = 240_000;
 const FEED_MAX_LINES = 1_200;

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

@@ -2,7 +2,7 @@ import { closeSync, existsSync, openSync, readFileSync, readSync, statSync } fro
 import { resolve, sep } from "node:path";
 
 import type { ChildResult, DelegationFailureKind } from "../types.js";
-import { isRecord } from "../utils/records.js";
+import { isRecord } from "../core/utils/records.js";
 
 export type DelegationRunSource = "delegate_agent" | "delegate_task";
 export type DelegationRunMode = "single" | "parallel" | "chain";

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 { pruneExpiredZobLivePeers, 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.onlineAliases.filter((alias) => alias !== selfAlias).slice(0, 6).map((alias) => `@${alias}`);
+    const unavailable = summary.stale + summary.offline;
+    const duplicateText = summary.duplicateAliases.length > 0 ? ` liveDuplicates=${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?.onlineAliases ?? []).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 live 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 = [
@@ -377,6 +389,7 @@ function handleSameAgentModeIntent(pi: ExtensionAPI, state: HarnessRuntimeState,
 async function startOrRefreshZobLiveRuntime(pi: ExtensionAPI, state: HarnessRuntimeState, ctx: ExtensionContext): Promise<void> {
   const repoRoot = ctx.cwd;
   const profileId = zpeerRuntimeProfileId(ctx);
+  try { pruneExpiredZobLivePeers(repoRoot); } catch { /* best-effort ghost peer cleanup; live runtime must remain available */ }
   const policy = readZobComsV2Policy(repoRoot);
   if (policy.mode === "off" || policy.mode === "required_network") {
     safelyUpdateZobLivePeer(repoRoot, state.zobLive.peerCard ? "touch" : "register");
@@ -407,7 +420,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 +438,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 +961,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 +971,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;