zob-harness 0.2.0 → 0.3.1

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({

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

@@ -1,9 +1,9 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
-import { buildZcommitPlan, runGovernedZcommitCommit, runGovernedZcommitPush, type ZcommitCommandResult, type ZcommitPlan, type ZcommitPlanOptions } from "../git-ops.js";
-import { ZcommitRunParams } from "../schemas.js";
+import { buildZcommitPlan, runGovernedZcommitCommit, runGovernedZcommitPush, type ZcommitCommandResult, type ZcommitPlan, type ZcommitPlanOptions } from "../domains/git/git-ops.js";
+import { ZcommitRunParams } from "./schemas.js";
 import type { HarnessRuntimeState } from "./state.js";
-import { sha256 } from "../utils/hashing.js";
+import { sha256 } from "../core/utils/hashing.js";
 
 function uniqueSorted(values: string[]): string[] {
   return [...new Set(values.filter((value) => value.trim().length > 0))].sort();

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

@@ -1,13 +1,13 @@
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 
-import { MODE_TOOLS } from "../constants.js";
-import { buildDaemonRuntimeState, buildDaemonTickPlan } from "../daemon-runtime.js";
-import { goalTodoCompletionDiagnostics, summarizeGoalTodos } from "../goal-todos.js";
-import { isRecord } from "../utils/records.js";
+import { MODE_TOOLS } from "../core/constants.js";
+import { buildDaemonRuntimeState, buildDaemonTickPlan } from "../domains/autonomy/daemon-runtime.js";
+import { goalTodoCompletionDiagnostics, summarizeGoalTodos } from "../domains/goal/goal-todos.js";
+import { isRecord } from "../core/utils/records.js";
 import type { AssistantLikeMessage, ModeName } from "../types.js";
-import { readHarnessReadinessWidgetData } from "../orchestration/widget-readers.js";
-import { buildZpeerPeerRoomSummaries, type ZpeerPeerRoomSummary } from "../coms-v2/zpeer.js";
+import { readHarnessReadinessWidgetData } from "../domains/orchestration/widget-readers.js";
+import { buildZpeerPeerRoomSummaries, type ZpeerPeerRoomSummary } from "../domains/coms/coms-v2/zpeer.js";
 import { delegationCost, delegationDurationMs, formatDelegationCost, formatDuration, summarizeDelegations } from "./delegation-monitor.js";
 import { disposeDelegationMouseSupport } from "./delegation-mouse.js";
 import { formatZcompactHudLine } from "./auto-compaction.js";
@@ -353,8 +353,8 @@ export function renderHarnessWidget(pi: ExtensionAPI, state: HarnessRuntimeState
           const marker = summary.active ? "*" : " ";
           const selfAlias = `@${summary.selfAlias ?? "?"}`;
           const peerState = `${summary.online}/${summary.peerCount}${summary.stale > 0 ? ` s${summary.stale}` : ""}${summary.offline > 0 ? ` off${summary.offline}` : ""}`;
-          const peerAliases = summary.aliases.filter((alias) => alias !== summary.selfAlias).slice(0, 2).map((alias) => `@${alias}`);
-          const aliasOverflow = Math.max(0, summary.aliases.length - (summary.selfAlias && summary.aliases.includes(summary.selfAlias) ? 1 : 0) - peerAliases.length);
+          const peerAliases = summary.onlineAliases.filter((alias) => alias !== summary.selfAlias).slice(0, 2).map((alias) => `@${alias}`);
+          const aliasOverflow = Math.max(0, summary.onlineAliases.length - (summary.selfAlias && summary.onlineAliases.includes(summary.selfAlias) ? 1 : 0) - peerAliases.length);
           const aliasText = peerAliases.length > 0 ? `${peerAliases.join(" ")}${aliasOverflow > 0 ? ` +${aliasOverflow}` : ""}` : "no peers";
           return theme.fg("muted", truncateToWidth(`${marker} ${summary.roomId} ${selfAlias} ${peerState} ${aliasText}`, 52, "…"));
         });
@@ -427,10 +427,27 @@ export function renderHarnessWidget(pi: ExtensionAPI, state: HarnessRuntimeState
   });
 }
 
+type PiToolInfo = ReturnType<ExtensionAPI["getAllTools"]>[number];
+
+function isZobInternalTool(tool: PiToolInfo): boolean {
+  const path = tool.sourceInfo.path.replace(/\\/g, "/");
+  return path.includes("/.pi/extensions/zob-harness/") || path.includes("/.pi/extensions/zob-switch/");
+}
+
+function isExternalPackageTool(tool: PiToolInfo): boolean {
+  return tool.sourceInfo.source !== "builtin" && tool.sourceInfo.source !== "sdk" && !isZobInternalTool(tool);
+}
+
+function uniqueToolNames(names: string[]): string[] {
+  return [...new Set(names)];
+}
+
 export function applyMode(pi: ExtensionAPI, state: HarnessRuntimeState, ctx: ExtensionContext, mode: ModeName, persist = true): void {
   state.activeMode = mode;
-  const available = new Set(pi.getAllTools().map((tool) => tool.name));
-  const activeTools = mode === "vanilla" ? [...available] : MODE_TOOLS[mode].filter((tool) => available.has(tool));
+  const allTools = pi.getAllTools();
+  const available = new Set(allTools.map((tool) => tool.name));
+  const externalPackageTools = allTools.filter(isExternalPackageTool).map((tool) => tool.name);
+  const activeTools = mode === "vanilla" ? [...available] : uniqueToolNames([...MODE_TOOLS[mode].filter((tool) => available.has(tool)), ...externalPackageTools]);
   pi.setActiveTools(activeTools);
   if (persist) pi.appendEntry("zob-mode-state", { mode, timestamp: new Date().toISOString() });
   ctx.ui.setStatus("zob-mode", ctx.ui.theme.fg("accent", `zob:${mode}`));

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

@@ -12,7 +12,7 @@ import { registerMissionControlTools } from "./tools-mission-control.js";
 import { registerFactoryTools } from "./tools-factory.js";
 import { registerProjectDnaTools } from "./tools-project-dna.js";
 import { registerOrchestrationTools } from "./tools-orchestration.js";
-import { registerGoalRuntimeEvents, registerGoalRuntimeTools } from "../goal-runtime.js";
+import { registerGoalRuntimeEvents, registerGoalRuntimeTools } from "./goal-runtime.js";
 import { registerGoalRoomTools } from "./tools-goal-room.js";
 import { registerGovernedRequestTools } from "./tools-governed-requests.js";
 import { registerWorkspaceClaimTools } from "./tools-workspace-claims.js";

package/.pi/extensions/zob-harness/src/types.ts

@@ -1,4 +1,4 @@
-import type { ChildChangedPathRef, ModeName } from "./types/core.js";
+import type { ChildChangedPathRef, ModeName } from "./core/types/core.js";
 
 export type {
   AgentScope,
@@ -9,7 +9,7 @@ export type {
   JsonEvent,
   ModeName,
   TextBlock,
-} from "./types/core.js";
+} from "./core/types/core.js";
 
 export interface DamageRule {
   pattern: string;

package/.pi/extensions/zob-switch/AGENTS.md

@@ -0,0 +1,9 @@
+# zob-switch Extension Guardrails
+
+- This folder owns the `/zob` Pi switch extension only.
+- Keep `.pi/extensions/zob-switch/index.ts` as the stable Pi entrypoint and preserve its default export.
+- Split-only refactors are allowed; do not change `/zob` behavior, command registration, aliases/autocomplete behavior, messages, settings paths, snapshot paths, schemas, defaults, or sync/async behavior.
+- Use NodeNext relative imports with `.js` suffix.
+- Use `import type` for type-only imports.
+- No file under `src/` may import from `index.ts`.
+- Do not touch secrets, generated/vendor folders, logs, sessions, reports, or unrelated extensions from this package.

package/.pi/extensions/zob-switch/index.ts

@@ -1,134 +1,22 @@
 import { existsSync } from "node:fs";
-import { mkdir, readFile, writeFile } from "node:fs/promises";
-import { dirname, join } from "node:path";
+import { join } from "node:path";
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import type { AutocompleteItem } from "@earendil-works/pi-tui";
 
-const SETTINGS_PATH = join(".pi", "settings.json");
-const SNAPSHOT_PATH = join(".pi", "tmp", "zob-switch", "settings-snapshot.json");
-const SWITCH_EXTENSION = "extensions/zob-switch/index.ts";
-const HARNESS_EXTENSION = "extensions/zob-harness/index.ts";
-const ZOB_PROMPTS = "prompts";
-const ZOB_SKILLS = "skills";
-
-type JsonObject = Record<string, unknown>;
-
-type Snapshot = {
-  schema: "zob.harness-switch.settings-snapshot.v1";
-  savedAt: string;
-  settings: JsonObject;
-};
-
-function isObject(value: unknown): value is JsonObject {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
-function asStringArray(value: unknown): string[] {
-  return Array.isArray(value) ? value.filter((entry): entry is string => typeof entry === "string") : [];
-}
-
-function uniqueWithRequiredFirst(values: string[], requiredFirst: string[]): string[] {
-  const result: string[] = [];
-  for (const value of [...requiredFirst, ...values]) {
-    if (!result.includes(value)) result.push(value);
-  }
-  return result;
-}
-
-function withoutValues(values: string[], remove: string[]): string[] {
-  return values.filter((value) => !remove.includes(value));
-}
-
-function hasValue(settings: JsonObject, key: "extensions" | "prompts" | "skills", value: string): boolean {
-  return asStringArray(settings[key]).includes(value);
-}
-
-async function readSettings(cwd: string): Promise<JsonObject> {
-  const raw = await readFile(join(cwd, SETTINGS_PATH), "utf8");
-  const parsed = JSON.parse(raw) as unknown;
-  if (!isObject(parsed)) throw new Error(`${SETTINGS_PATH} must contain a JSON object`);
-  return parsed;
-}
+import { argumentCompletions } from "./src/autocomplete.js";
+import { HARNESS_EXTENSION, SETTINGS_PATH } from "./src/paths.js";
+import { readSettings, writeSettings } from "./src/settings.js";
+import type { JsonObject } from "./src/settings.js";
+import { readSnapshot, writeSnapshot } from "./src/snapshot.js";
+import type { Snapshot } from "./src/snapshot.js";
+import { buildOffSettings, buildOnSettings, hasValue, statusFor } from "./src/state.js";
 
-async function writeSettings(cwd: string, settings: JsonObject): Promise<void> {
-  await writeFile(join(cwd, SETTINGS_PATH), `${JSON.stringify(settings, null, 2)}\n`, "utf8");
-}
-
-async function writeSnapshot(cwd: string, settings: JsonObject): Promise<void> {
-  const snapshot: Snapshot = {
-    schema: "zob.harness-switch.settings-snapshot.v1",
-    savedAt: new Date().toISOString(),
-    settings,
-  };
-  const snapshotPath = join(cwd, SNAPSHOT_PATH);
-  await mkdir(dirname(snapshotPath), { recursive: true });
-  await writeFile(snapshotPath, `${JSON.stringify(snapshot, null, 2)}\n`, "utf8");
-}
-
-async function readSnapshot(cwd: string): Promise<Snapshot | null> {
-  const snapshotPath = join(cwd, SNAPSHOT_PATH);
-  if (!existsSync(snapshotPath)) return null;
-  const parsed = JSON.parse(await readFile(snapshotPath, "utf8")) as unknown;
-  if (!isObject(parsed) || parsed.schema !== "zob.harness-switch.settings-snapshot.v1" || !isObject(parsed.settings)) {
-    throw new Error(`${SNAPSHOT_PATH} is not a valid ZOB switch snapshot`);
-  }
-  return parsed as Snapshot;
-}
+const SNAPSHOT_PATH = join(".pi", "tmp", "zob-switch", "settings-snapshot.json");
 
 function shouldWriteOffSnapshot(current: JsonObject, snapshot: Snapshot | null): boolean {
   return snapshot === null || hasValue(current, "extensions", HARNESS_EXTENSION);
 }
 
-function buildOffSettings(current: JsonObject): JsonObject {
-  return {
-    ...current,
-    extensions: uniqueWithRequiredFirst(withoutValues(asStringArray(current.extensions), [HARNESS_EXTENSION]), [SWITCH_EXTENSION]),
-    prompts: withoutValues(asStringArray(current.prompts), [ZOB_PROMPTS]),
-    skills: withoutValues(asStringArray(current.skills), [ZOB_SKILLS]),
-  };
-}
-
-function buildOnSettings(base: JsonObject, usedSnapshot: boolean): JsonObject {
-  return {
-    ...base,
-    extensions: uniqueWithRequiredFirst(asStringArray(base.extensions), [SWITCH_EXTENSION, HARNESS_EXTENSION]),
-    prompts: usedSnapshot ? asStringArray(base.prompts) : uniqueWithRequiredFirst(asStringArray(base.prompts), [ZOB_PROMPTS]),
-    skills: usedSnapshot ? asStringArray(base.skills) : uniqueWithRequiredFirst(asStringArray(base.skills), [ZOB_SKILLS]),
-  };
-}
-
-function statusFor(settings: JsonObject, snapshotPresent: boolean): string {
-  const switchConfigured = hasValue(settings, "extensions", SWITCH_EXTENSION);
-  const harnessConfigured = hasValue(settings, "extensions", HARNESS_EXTENSION);
-  const promptsConfigured = hasValue(settings, "prompts", ZOB_PROMPTS);
-  const skillsConfigured = hasValue(settings, "skills", ZOB_SKILLS);
-  const state = switchConfigured && harnessConfigured && promptsConfigured && skillsConfigured
-    ? "on"
-    : switchConfigured && !harnessConfigured && !promptsConfigured && !skillsConfigured
-      ? "off"
-      : "partial";
-  return [
-    `ZOB Harness switch: ${state}`,
-    `switch extension: ${switchConfigured ? "configured" : "missing"}`,
-    `harness extension: ${harnessConfigured ? "configured" : "missing"}`,
-    `prompts: ${promptsConfigured ? "configured" : "missing"}`,
-    `skills: ${skillsConfigured ? "configured" : "missing"}`,
-    `snapshot: ${snapshotPresent ? "present" : "missing"}`,
-  ].join("\n");
-}
-
-function argumentCompletions(prefix: string): AutocompleteItem[] | null {
-  const query = prefix.trim().toLowerCase();
-  const items: AutocompleteItem[] = [
-    { value: "on", label: "on", description: "restore ZOB Harness from snapshot/defaults and reload" },
-    { value: "off", label: "off", description: "snapshot settings, unload ZOB Harness resources, and reload" },
-    { value: "status", label: "status", description: "show switch/harness/prompts/skills/snapshot state" },
-  ];
-  const filtered = query ? items.filter((item) => item.value.startsWith(query)) : items;
-  return filtered.length > 0 ? filtered : null;
-}
-
 export default function zobSwitch(pi: ExtensionAPI): void {
   pi.registerCommand("zob", {
     description: "Switch ZOB Harness on/off or show status: /zob on|off|status",

package/.pi/extensions/zob-switch/src/AGENTS.md

@@ -0,0 +1,8 @@
+# zob-switch src Guardrails
+
+- Modules here are sidecars for `.pi/extensions/zob-switch/index.ts`.
+- Move code only; do not rewrite logic, optimize, reorder behavior, rename helpers for behavior changes, or alter strings/schemas/paths.
+- Preserve `/zob` command behavior exactly, including settings and snapshot semantics.
+- Use NodeNext relative imports with `.js` suffix.
+- Use `import type` for type-only imports.
+- Never import from `../index.ts` or any `index.ts` entrypoint.

package/.pi/extensions/zob-switch/src/autocomplete.ts

@@ -0,0 +1,12 @@
+import type { AutocompleteItem } from "@earendil-works/pi-tui";
+
+export function argumentCompletions(prefix: string): AutocompleteItem[] | null {
+  const query = prefix.trim().toLowerCase();
+  const items: AutocompleteItem[] = [
+    { value: "on", label: "on", description: "restore ZOB Harness from snapshot/defaults and reload" },
+    { value: "off", label: "off", description: "snapshot settings, unload ZOB Harness resources, and reload" },
+    { value: "status", label: "status", description: "show switch/harness/prompts/skills/snapshot state" },
+  ];
+  const filtered = query ? items.filter((item) => item.value.startsWith(query)) : items;
+  return filtered.length > 0 ? filtered : null;
+}

package/.pi/extensions/zob-switch/src/paths.ts

@@ -0,0 +1,8 @@
+import { join } from "node:path";
+
+export const SETTINGS_PATH = join(".pi", "settings.json");
+export const SNAPSHOT_PATH = join(".pi", "tmp", "zob-switch", "settings-snapshot.json");
+export const SWITCH_EXTENSION = "extensions/zob-switch/index.ts";
+export const HARNESS_EXTENSION = "extensions/zob-harness/index.ts";
+export const ZOB_PROMPTS = "prompts";
+export const ZOB_SKILLS = "skills";