@nseng-ai/areg 0.1.1 → 0.1.2

package/src/fake-gateways.ts

@@ -1,28 +1,17 @@
 import { optionalEntry } from "@nseng-ai/foundation/primitives";
-import { resultErr, resultOk } from "@nseng-ai/foundation/result";
 import {
 	skillLookupBaseRelativePath,
 	skillLookupDescriptorForRoot,
 	skillLookupDescriptorForSourceType,
 	type SkillLookupRoot,
 	type SkillLookupSourceType,
-} from "./skill-lookup.ts";
+} from "@nseng-ai/foundation/skill-lookup";
 
 import { missingCheckSkillInspection } from "./gateways.ts";
 import type {
 	AregCheckPairingDirectory,
 	AregCheckSkillInspection,
 	AregErrorInfo,
-	AregGithubGateway,
-	AregGithubSkillFileResult,
-	AregGithubSkillListResult,
-	AregHostGateway,
-	AregHostToolName,
-	AregNpxSkillsAddRequest,
-	AregNpxSkillsAddResult,
-	AregNpxSkillsGateway,
-	AregOperationResult,
-	AregPathState,
 	AregPiSkillInventoryInspection,
 	AregProjectBaseInspection,
 	AregProjectDirRequest,
@@ -34,7 +23,6 @@ import type {
 	AregProjectRemoveEmptyDirResult,
 	AregProjectSymlinkDeleteRequest,
 	AregProjectTextWriteRequest,
-	AregPromptGateway,
 	AregSkillFindRootsInspection,
 	AregSkillFindSkillInspection,
 	AregSkillInspectionRequest,
@@ -42,26 +30,25 @@ import type {
 	AregSkillKindResolveResult,
 	AregSkillKindSkillInspection,
 	AregSkillKindSourceType,
-	AregSkillxInstallRequest,
-	AregSkillxInstallResult,
-	AregSkillxInstalledSkill,
-	AregSkillxWorkspaceCleanupRequest,
-	AregSkillxWorkspaceGateway,
-	AregTextFileState,
-	AregToolCheckResult,
 } from "./gateways.ts";
+import type {
+	AregManifestSkillSourceInspection,
+	AregManifestSkillSourcesInspection,
+} from "./operations/manifest-sources.ts";
 import { classifyResolvedSkillKindInspection } from "./gateways/skill-kind-classification.ts";
 import {
 	classifySkillMirrorSymlinkState,
 	parseSkillMirrorRelativePath,
-} from "./operations/skill-mirror-conventions.ts";
+	type PathState,
+	type TextFileState,
+} from "@nseng-ai/harness-artifacts/api";
 
 export type FakeAregProjectOperation =
 	| { type: "inspect-project-base"; cwd: string; projectPath: string }
-	| { type: "inspect-instruction-files"; projectDir: string }
 	| { type: "inspect-pi-artifacts"; projectDir: string }
 	| { type: "inspect-pi-skill-inventory"; projectDir: string }
 	| { type: "inspect-skill-name-inventory"; projectDir: string }
+	| { type: "inspect-manifest-skill-sources"; projectDir: string }
 	| { type: "inspect-skill-find-roots"; projectDir: string }
 	| { type: "inspect-check-skill"; projectDir: string; skillName: string }
 	| { type: "inspect-skill-kind-skill"; projectDir: string; skillName: string }
@@ -79,23 +66,36 @@ export type FakeAregProjectOperation =
 
 export interface FakeAregCheckSkillOptions {
 	name: string;
-	skillsPath?: AregPathState;
-	agentsPath?: AregPathState;
-	claudePath?: AregPathState;
-	localSkillMd?: AregTextFileState | string;
-	remoteSkillMd?: AregTextFileState | string;
-	openaiPolicy?: AregTextFileState | string;
+	skillsPath?: PathState;
+	agentsPath?: PathState;
+	claudePath?: PathState;
+	localSkillMd?: TextFileState | string;
+	remoteSkillMd?: TextFileState | string;
+	openaiPolicy?: TextFileState | string;
 }
 
 export interface FakeAregSkillKindSkillOptions {
 	name: string;
 	sourceType?: AregSkillKindSourceType;
 	baseRelativePath?: string;
-	skillDir?: AregPathState;
-	skillMd?: AregTextFileState | string;
-	openaiPolicy?: AregTextFileState | string;
-	agentsPath?: AregPathState;
-	claudePath?: AregPathState;
+	skillDir?: PathState;
+	skillMd?: TextFileState | string;
+	openaiPolicy?: TextFileState | string;
+	agentsPath?: PathState;
+	claudePath?: PathState;
+}
+
+export interface FakeAregManifestSkillSourceOptions {
+	skillName: string;
+	harness?: AregManifestSkillSourceInspection["harness"];
+	scope?: AregManifestSkillSourceInspection["scope"];
+	manifestPath?: string;
+	manifestKey?: string;
+	provenance?: Partial<AregManifestSkillSourceInspection["provenance"]>;
+	targetRootRelativePath?: string;
+	targetSkillRelativePath?: string;
+	skillDir?: PathState;
+	skillMd?: TextFileState | string;
 }
 
 export interface FakeAregSkillFindSkillOptions {
@@ -103,23 +103,19 @@ export interface FakeAregSkillFindSkillOptions {
 	root?: SkillLookupRoot;
 	sourceType?: SkillLookupSourceType;
 	baseRelativePath?: string;
-	skillDir?: AregPathState;
-	skillMd?: AregTextFileState | string;
+	skillDir?: PathState;
+	skillMd?: TextFileState | string;
 }
 
 export interface FakeAregProjectGatewayOptions {
 	projectDir?: string;
-	projectPathState?: AregPathState;
-	targetPathState?: AregPathState;
-	lockfile?: AregTextFileState | object | string;
-	nsToml?: AregTextFileState | string;
-	aregJson?: AregTextFileState | object | string;
-	agentsMd?: AregTextFileState | string;
-	claudeMd?: AregTextFileState | string;
-	claudeDir?: AregPathState;
-	claudeSettings?: AregTextFileState | string;
-	piDir?: AregPathState;
-	piSettings?: AregTextFileState | object | string;
+	projectPathState?: PathState;
+	targetPathState?: PathState;
+	lockfile?: TextFileState | object | string;
+	nsToml?: TextFileState | string;
+	aregJson?: TextFileState | object | string;
+	piDir?: PathState;
+	piSettings?: TextFileState | object | string;
 	replacementSurfaces?: readonly string[];
 	piSkillInventory?: Partial<AregPiSkillInventoryInspection>;
 	skillsDirectoryNames?: readonly string[];
@@ -129,6 +125,8 @@ export interface FakeAregProjectGatewayOptions {
 	checkSkills?: readonly FakeAregCheckSkillOptions[];
 	localSkills?: readonly FakeAregSkillKindSkillOptions[];
 	findSkills?: readonly FakeAregSkillFindSkillOptions[];
+	manifestSkillSources?: readonly FakeAregManifestSkillSourceOptions[];
+	manifestErrors?: readonly AregManifestSkillSourcesInspection["errors"][number][];
 	pairingDirectories?: readonly AregCheckPairingDirectory[];
 	resolveFailures?: Readonly<Record<string, AregErrorInfo>>;
 	preflightFailures?: Readonly<Record<string, AregErrorInfo>>;
@@ -138,10 +136,9 @@ export interface FakeAregProjectGatewayOptions {
 
 export class FakeAregProjectGateway implements AregProjectGateway {
 	private readonly projectDir: string;
-	private readonly projectPathState: AregPathState;
-	private readonly files: Map<string, AregTextFileState>;
-	private readonly claudeDir: AregPathState;
-	private readonly piDir: AregPathState;
+	private readonly projectPathState: PathState;
+	private readonly files: Map<string, TextFileState>;
+	private readonly piDir: PathState;
 	private readonly replacementSurfaces: readonly string[];
 	private readonly piSkillInventory: AregPiSkillInventoryInspection | undefined;
 	private readonly skillsDirectoryNames: readonly string[];
@@ -151,6 +148,7 @@ export class FakeAregProjectGateway implements AregProjectGateway {
 	private readonly checkSkills: AregCheckSkillInspection[];
 	private readonly localSkills: AregSkillKindSkillInspection[];
 	private readonly explicitFindSkills: AregSkillFindSkillInspection[] | undefined;
+	private readonly manifestSkillSources: AregManifestSkillSourcesInspection;
 	private readonly pairingDirectories: readonly AregCheckPairingDirectory[];
 	private readonly resolveFailures: ReadonlyMap<string, AregErrorInfo>;
 	private readonly preflightFailures: ReadonlyMap<string, AregErrorInfo>;
@@ -166,15 +164,8 @@ export class FakeAregProjectGateway implements AregProjectGateway {
 			["skills-lock.json", normalizeTextFileState(options.lockfile ?? { version: 1, skills: {} })],
 			["ns.toml", normalizeTextFileState(options.nsToml ?? { type: "missing" })],
 			["areg.json", normalizeTextFileState(options.aregJson ?? { type: "missing" })],
-			["AGENTS.md", normalizeTextFileState(options.agentsMd ?? { type: "missing" })],
-			["CLAUDE.md", normalizeTextFileState(options.claudeMd ?? { type: "missing" })],
-			[
-				".claude/settings.local.json",
-				normalizeTextFileState(options.claudeSettings ?? { type: "missing" }),
-			],
 			[".pi/settings.json", normalizeTextFileState(options.piSettings ?? { type: "missing" })],
 		]);
-		this.claudeDir = copyPathState(options.claudeDir ?? { type: "missing" });
 		this.piDir = copyPathState(options.piDir ?? { type: "missing" });
 		this.replacementSurfaces = [...(options.replacementSurfaces ?? [])];
 		this.piSkillInventory =
@@ -189,6 +180,10 @@ export class FakeAregProjectGateway implements AregProjectGateway {
 		this.localSkills = (options.localSkills ?? []).map(copyFakeSkillKindSkill);
 		this.explicitFindSkills =
 			options.findSkills === undefined ? undefined : options.findSkills.map(copyFakeSkillFindSkill);
+		this.manifestSkillSources = {
+			sources: (options.manifestSkillSources ?? []).map(copyFakeManifestSkillSource),
+			errors: (options.manifestErrors ?? []).map((error) => ({ ...error })),
+		};
 		this.pairingDirectories = (options.pairingDirectories ?? []).map(copyPairingDirectory);
 		this.resolveFailures = new Map(
 			Object.entries(options.resolveFailures ?? {}).map(([key, value]) => [
@@ -228,16 +223,6 @@ export class FakeAregProjectGateway implements AregProjectGateway {
 		};
 	}
 
-	async inspectInstructionFiles(request: AregProjectDirRequest) {
-		this.log.push({ type: "inspect-instruction-files", projectDir: request.projectDir });
-		return {
-			agentsMd: this.fileState("AGENTS.md"),
-			claudeMd: this.fileState("CLAUDE.md"),
-			claudeDir: copyPathState(this.claudeDir),
-			claudeSettings: this.fileState(".claude/settings.local.json"),
-		};
-	}
-
 	async inspectPiArtifacts(request: AregProjectDirRequest) {
 		this.log.push({ type: "inspect-pi-artifacts", projectDir: request.projectDir });
 		return {
@@ -271,6 +256,16 @@ export class FakeAregProjectGateway implements AregProjectGateway {
 		};
 	}
 
+	async inspectManifestSkillSources(
+		request: AregProjectDirRequest,
+	): Promise<AregManifestSkillSourcesInspection> {
+		this.log.push({ type: "inspect-manifest-skill-sources", projectDir: request.projectDir });
+		return {
+			sources: this.manifestSkillSources.sources.map(copyManifestSkillSource),
+			errors: this.manifestSkillSources.errors.map((error) => ({ ...error })),
+		};
+	}
+
 	async inspectSkillFindRoots(
 		request: AregProjectDirRequest,
 	): Promise<AregSkillFindRootsInspection> {
@@ -348,7 +343,6 @@ export class FakeAregProjectGateway implements AregProjectGateway {
 			content: request.content,
 			description: request.description,
 			createParent: request.createParent,
-			policy: request.policy,
 		});
 		const failure = this.preflightFailure(request.relativePath);
 		return failure === undefined ? { ok: true } : { ok: false, error: failure };
@@ -362,7 +356,6 @@ export class FakeAregProjectGateway implements AregProjectGateway {
 			projectDir: request.projectDir,
 			relativePath: request.relativePath,
 			description: request.description,
-			policy: request.policy,
 		});
 		const failure = this.preflightFailure(request.relativePath);
 		return failure === undefined ? { ok: true } : { ok: false, error: failure };
@@ -376,7 +369,6 @@ export class FakeAregProjectGateway implements AregProjectGateway {
 			projectDir: request.projectDir,
 			relativePath: request.relativePath,
 			description: request.description,
-			policy: request.policy,
 		});
 		const failure =
 			this.preflightFailure(request.relativePath) ??
@@ -392,7 +384,6 @@ export class FakeAregProjectGateway implements AregProjectGateway {
 			projectDir: request.projectDir,
 			relativePath: request.relativePath,
 			description: request.description,
-			policy: request.policy,
 		});
 		const failure = this.preflightFailure(request.relativePath);
 		return failure === undefined ? { ok: true } : { ok: false, error: failure };
@@ -406,7 +397,6 @@ export class FakeAregProjectGateway implements AregProjectGateway {
 			content: request.content,
 			description: request.description,
 			createParent: request.createParent,
-			policy: request.policy,
 		});
 		const failure = this.mutationFailure(request.relativePath);
 		if (failure !== undefined) return { ok: false, error: failure };
@@ -425,7 +415,6 @@ export class FakeAregProjectGateway implements AregProjectGateway {
 			projectDir: request.projectDir,
 			relativePath: request.relativePath,
 			description: request.description,
-			policy: request.policy,
 		});
 		const failure = this.mutationFailure(request.relativePath);
 		if (failure !== undefined) return { ok: false, error: failure };
@@ -444,7 +433,6 @@ export class FakeAregProjectGateway implements AregProjectGateway {
 			projectDir: request.projectDir,
 			relativePath: request.relativePath,
 			description: request.description,
-			policy: request.policy,
 		});
 		const failure =
 			this.mutationFailure(request.relativePath) ??
@@ -467,7 +455,6 @@ export class FakeAregProjectGateway implements AregProjectGateway {
 			projectDir: request.projectDir,
 			relativePath: request.relativePath,
 			description: request.description,
-			policy: request.policy,
 		});
 		const failure = this.mutationFailure(request.relativePath);
 		if (failure !== undefined) return { ok: false, error: failure };
@@ -483,7 +470,7 @@ export class FakeAregProjectGateway implements AregProjectGateway {
 		return this.log.map(copyProjectOperation);
 	}
 
-	private fileState(relativePath: string): AregTextFileState {
+	private fileState(relativePath: string): TextFileState {
 		return copyTextFileState(this.files.get(relativePath) ?? { type: "missing" });
 	}
 
@@ -522,267 +509,6 @@ export class FakeAregProjectGateway implements AregProjectGateway {
 	}
 }
 
-export type FakeAregHostOperation = { type: "check-tool"; tool: AregHostToolName; cwd: string };
-
-export interface FakeAregHostGatewayOptions {
-	tools?: Partial<Record<AregHostToolName, string | null>>;
-}
-
-export class FakeAregHostGateway implements AregHostGateway {
-	private readonly tools: ReadonlyMap<AregHostToolName, string | null>;
-	private readonly log: FakeAregHostOperation[] = [];
-
-	constructor(options: FakeAregHostGatewayOptions = {}) {
-		this.tools = new Map(
-			Object.entries(options.tools ?? {}) as Array<[AregHostToolName, string | null]>,
-		);
-	}
-
-	async checkTool(options: {
-		tool: AregHostToolName;
-		cwd: string;
-		env: NodeJS.ProcessEnv;
-	}): Promise<AregToolCheckResult> {
-		this.log.push({ type: "check-tool", tool: options.tool, cwd: options.cwd });
-		const path = this.tools.get(options.tool);
-		if (path === null)
-			return {
-				type: "missing",
-				tool: options.tool,
-				message: `Required host tool is missing: ${options.tool}`,
-			};
-		return { type: "found", tool: options.tool, path: path ?? `/fake/bin/${options.tool}` };
-	}
-
-	operations(): readonly FakeAregHostOperation[] {
-		return this.log.map((operation) => ({ ...operation }));
-	}
-}
-
-export type FakeAregGithubOperation =
-	| {
-			type: "list-skill-directory-names";
-			repo: string;
-			ref?: string;
-	  }
-	| {
-			type: "check-skill-file";
-			repo: string;
-			path: string;
-			ref?: string;
-	  };
-
-export interface FakeAregGithubGatewayOptions {
-	repos?: Record<string, readonly string[] | "missing" | "auth-error" | AregErrorInfo>;
-	files?: Record<string, "found" | "missing" | "auth-error" | AregErrorInfo>;
-}
-
-export class FakeAregGithubGateway implements AregGithubGateway {
-	private readonly repos: ReadonlyMap<
-		string,
-		readonly string[] | "missing" | "auth-error" | AregErrorInfo
-	>;
-	private readonly files: ReadonlyMap<string, "found" | "missing" | "auth-error" | AregErrorInfo>;
-	private readonly log: FakeAregGithubOperation[] = [];
-
-	constructor(options: FakeAregGithubGatewayOptions = {}) {
-		this.repos = new Map(
-			Object.entries(options.repos ?? {}).map(([repo, value]) => [repo, copyGithubState(value)]),
-		);
-		this.files = new Map(
-			Object.entries(options.files ?? {}).map(([path, value]) => [
-				path,
-				copyGithubFileState(value),
-			]),
-		);
-	}
-
-	async listSkillDirectoryNames(options: {
-		repo: string;
-		ref?: string;
-		env: NodeJS.ProcessEnv;
-	}): Promise<AregGithubSkillListResult> {
-		this.log.push({
-			type: "list-skill-directory-names",
-			repo: options.repo,
-			...optionalEntry("ref", options.ref),
-		});
-		const state = this.repos.get(options.repo);
-		if (state === undefined || state === "missing")
-			return { type: "missing", message: `Skill source not found: ${options.repo}` };
-		if (state === "auth-error")
-			return { type: "auth-error", message: `GitHub authentication failed for ${options.repo}` };
-		if (isReadonlyStringArray(state)) return { type: "ok", skillNames: [...state] };
-		return { type: "error", error: copyErrorInfo(state) };
-	}
-
-	async checkSkillFile(options: {
-		repo: string;
-		path: string;
-		ref?: string;
-		env: NodeJS.ProcessEnv;
-	}): Promise<AregGithubSkillFileResult> {
-		this.log.push({
-			type: "check-skill-file",
-			repo: options.repo,
-			path: options.path,
-			...optionalEntry("ref", options.ref),
-		});
-		const state = this.files.get(githubFileKey(options.repo, options.path, options.ref));
-		if (state === undefined || state === "found") return { type: "found" };
-		if (state === "missing")
-			return { type: "missing", message: `Skill file not found: ${options.repo}/${options.path}` };
-		if (state === "auth-error")
-			return { type: "auth-error", message: `GitHub authentication failed for ${options.repo}` };
-		return { type: "error", error: copyErrorInfo(state) };
-	}
-
-	operations(): readonly FakeAregGithubOperation[] {
-		return this.log.map((operation) => ({ ...operation }));
-	}
-}
-
-export type FakeAregNpxSkillsOperation = { type: "add-skills" } & Omit<
-	AregNpxSkillsAddRequest,
-	"env"
->;
-
-export interface FakeAregNpxSkillsGatewayOptions {
-	failure?: AregErrorInfo;
-	failures?: Readonly<Record<string, AregErrorInfo>>;
-}
-
-export class FakeAregNpxSkillsGateway implements AregNpxSkillsGateway {
-	private readonly failure: AregErrorInfo | undefined;
-	private readonly failures: ReadonlyMap<string, AregErrorInfo>;
-	private readonly log: FakeAregNpxSkillsOperation[] = [];
-
-	constructor(options: FakeAregNpxSkillsGatewayOptions = {}) {
-		this.failure = options.failure === undefined ? undefined : copyErrorInfo(options.failure);
-		this.failures = new Map(
-			Object.entries(options.failures ?? {}).map(([key, value]) => [key, copyErrorInfo(value)]),
-		);
-	}
-
-	async addSkills(request: AregNpxSkillsAddRequest): Promise<AregNpxSkillsAddResult> {
-		this.log.push({
-			type: "add-skills",
-			sourceRepo: request.sourceRepo,
-			skillNames: [...request.skillNames],
-			targetAgents: [...request.targetAgents],
-			cwd: request.cwd,
-		});
-		if (this.failure !== undefined) return { type: "error", error: copyErrorInfo(this.failure) };
-		const keyedFailure = this.failures.get(failureKey(request.sourceRepo, request.skillNames));
-		if (keyedFailure !== undefined) return { type: "error", error: copyErrorInfo(keyedFailure) };
-		return { type: "ok" };
-	}
-
-	operations(): readonly FakeAregNpxSkillsOperation[] {
-		return this.log.map((operation) => ({
-			...operation,
-			skillNames: [...operation.skillNames],
-			targetAgents: [...operation.targetAgents],
-		}));
-	}
-}
-
-export type FakeAregPromptOperation = {
-	type: "confirm";
-	message: string;
-	defaultValue: boolean;
-	response: boolean;
-};
-
-export interface FakeAregPromptGatewayOptions {
-	responses?: readonly boolean[];
-	shouldConfirmByDefault?: boolean;
-}
-
-export class FakeAregPromptGateway implements AregPromptGateway {
-	private readonly responses: boolean[];
-	private readonly shouldConfirmByDefault: boolean;
-	private readonly log: FakeAregPromptOperation[] = [];
-
-	constructor(options: FakeAregPromptGatewayOptions = {}) {
-		this.responses = [...(options.responses ?? [])];
-		this.shouldConfirmByDefault = options.shouldConfirmByDefault ?? false;
-	}
-
-	async confirm(request: { message: string; defaultValue: boolean }): Promise<boolean> {
-		const response = this.responses.shift() ?? this.shouldConfirmByDefault;
-		this.log.push({
-			type: "confirm",
-			message: request.message,
-			defaultValue: request.defaultValue,
-			response,
-		});
-		return response;
-	}
-
-	operations(): readonly FakeAregPromptOperation[] {
-		return this.log.map((operation) => ({ ...operation }));
-	}
-}
-
-export type FakeAregSkillxOperation =
-	| ({ type: "install-into-workspace" } & Omit<AregSkillxInstallRequest, "env">)
-	| ({ type: "cleanup-workspace" } & AregSkillxWorkspaceCleanupRequest);
-
-export interface FakeAregSkillxWorkspaceGatewayOptions {
-	workspaceRoot?: string;
-	installedSkills?: readonly AregSkillxInstalledSkill[];
-	failure?: AregErrorInfo;
-	cleanupFailure?: AregErrorInfo;
-}
-
-export class FakeAregSkillxWorkspaceGateway implements AregSkillxWorkspaceGateway {
-	private readonly workspaceRoot: string;
-	private readonly installedSkills: readonly AregSkillxInstalledSkill[];
-	private readonly failure: AregErrorInfo | undefined;
-	private readonly cleanupFailure: AregErrorInfo | undefined;
-	private readonly log: FakeAregSkillxOperation[] = [];
-
-	constructor(options: FakeAregSkillxWorkspaceGatewayOptions = {}) {
-		this.workspaceRoot = options.workspaceRoot ?? "/tmp/areg-skillx";
-		this.installedSkills = (options.installedSkills ?? []).map(copyInstalledSkill);
-		this.failure = options.failure === undefined ? undefined : copyErrorInfo(options.failure);
-		this.cleanupFailure =
-			options.cleanupFailure === undefined ? undefined : copyErrorInfo(options.cleanupFailure);
-	}
-
-	async installIntoWorkspace(request: AregSkillxInstallRequest): Promise<AregSkillxInstallResult> {
-		this.log.push({
-			type: "install-into-workspace",
-			sourceRepo: request.sourceRepo,
-			...optionalEntry("skillName", request.skillName),
-			cwd: request.cwd,
-		});
-		if (this.failure !== undefined) return { type: "error", error: copyErrorInfo(this.failure) };
-		return {
-			type: "ok",
-			workspace: {
-				workspaceRoot: this.workspaceRoot,
-				installedSkills: this.installedSkills.map(copyInstalledSkill),
-			},
-		};
-	}
-
-	async cleanupWorkspace(request: AregSkillxWorkspaceCleanupRequest): Promise<AregOperationResult> {
-		this.log.push({ type: "cleanup-workspace", workspaceRoot: request.workspaceRoot });
-		if (this.cleanupFailure !== undefined) return resultErr(copyErrorInfo(this.cleanupFailure));
-		return resultOk(undefined);
-	}
-
-	operations(): readonly FakeAregSkillxOperation[] {
-		return this.log.map((operation) => ({ ...operation }));
-	}
-}
-
-function failureKey(sourceRepo: string, skillNames: readonly string[]): string {
-	return `${sourceRepo}:${skillNames.join(",")}`;
-}
-
 function copyProjectOperation(operation: FakeAregProjectOperation): FakeAregProjectOperation {
 	switch (operation.type) {
 		case "write-text-file":
@@ -825,6 +551,33 @@ function copyFakeSkillFindSkill(
 	};
 }
 
+function copyFakeManifestSkillSource(
+	source: FakeAregManifestSkillSourceOptions,
+): AregManifestSkillSourceInspection {
+	const manifestKey = source.manifestKey ?? `skill:${source.skillName}:pi:project`;
+	const targetSkillRelativePath =
+		source.targetSkillRelativePath ?? `.pi/skills/${source.skillName}`;
+	return {
+		skillName: source.skillName,
+		harness: source.harness ?? "pi",
+		scope: source.scope ?? "project",
+		manifestPath: source.manifestPath ?? "/repo/.pi/skills/.ns-harness-artifacts-manifest.json",
+		manifestKey,
+		provenance: {
+			type: source.provenance?.type ?? "npm-module",
+			packageName: source.provenance?.packageName ?? "@example/skills",
+			relativePath: source.provenance?.relativePath ?? `skills/${source.skillName}`,
+			version: source.provenance?.version ?? "1.0.0",
+		},
+		targetRootRelativePath: source.targetRootRelativePath ?? ".pi/skills",
+		targetSkillRelativePath,
+		skillDir: copyPathState(source.skillDir ?? { type: "directory" }),
+		skillMd: normalizeTextFileState(
+			source.skillMd ?? `---\nname: ${source.skillName}\ndescription: ${source.skillName}\n---\n`,
+		),
+	};
+}
+
 function copyFakeSkillKindSkill(
 	skill: FakeAregSkillKindSkillOptions,
 ): AregSkillKindSkillInspection {
@@ -860,8 +613,8 @@ function copyCheckSkill(skill: AregCheckSkillInspection): AregCheckSkillInspecti
 interface SkillInspectionCore {
 	name: string;
 	baseRelativePath: string;
-	skillDir: AregPathState;
-	skillMd: AregTextFileState;
+	skillDir: PathState;
+	skillMd: TextFileState;
 }
 
 function copySkillInspectionCore(skill: SkillInspectionCore): SkillInspectionCore {
@@ -891,6 +644,17 @@ function copySkillFindSkill(skill: AregSkillFindSkillInspection): AregSkillFindS
 	};
 }
 
+function copyManifestSkillSource(
+	source: AregManifestSkillSourceInspection,
+): AregManifestSkillSourceInspection {
+	return {
+		...source,
+		provenance: { ...source.provenance },
+		skillDir: copyPathState(source.skillDir),
+		skillMd: copyTextFileState(source.skillMd),
+	};
+}
+
 function skillKindSkillToFindSkill(
 	skill: AregSkillKindSkillInspection,
 ): AregSkillFindSkillInspection {
@@ -935,13 +699,13 @@ function skillForRelativePath(
 	return skills.find((skill) => relativePath.startsWith(`${skill.baseRelativePath}/`));
 }
 
-function normalizeTextFileState(value: AregTextFileState | object | string): AregTextFileState {
+function normalizeTextFileState(value: TextFileState | object | string): TextFileState {
 	if (typeof value === "string") return { type: "file", text: value };
-	if ("type" in value) return copyTextFileState(value as AregTextFileState);
+	if ("type" in value) return copyTextFileState(value as TextFileState);
 	return { type: "file", text: `${JSON.stringify(value, null, 2)}\n` };
 }
 
-function copyTextFileState(state: AregTextFileState): AregTextFileState {
+function copyTextFileState(state: TextFileState): TextFileState {
 	return { ...state };
 }
 
@@ -955,7 +719,7 @@ function copyPiSkillInventory(
 	};
 }
 
-function copyPathState(state: AregPathState): AregPathState {
+function copyPathState(state: PathState): PathState {
 	return { ...state };
 }
 
@@ -968,42 +732,6 @@ function copyPairingDirectory(directory: AregCheckPairingDirectory): AregCheckPa
 	};
 }
 
-function copyGithubState(
-	value: readonly string[] | "missing" | "auth-error" | AregErrorInfo,
-): readonly string[] | "missing" | "auth-error" | AregErrorInfo {
-	if (isReadonlyStringArray(value)) return [...value];
-	if (value === "missing" || value === "auth-error") return value;
-	return copyErrorInfo(value);
-}
-
-function copyGithubFileState(
-	value: "found" | "missing" | "auth-error" | AregErrorInfo,
-): "found" | "missing" | "auth-error" | AregErrorInfo {
-	if (value === "found" || value === "missing" || value === "auth-error") return value;
-	return copyErrorInfo(value);
-}
-
-function githubFileKey(repo: string, path: string, ref: string | undefined): string {
-	return ref === undefined ? `${repo}:${path}` : `${repo}:${path}@${ref}`;
-}
-
-function isReadonlyStringArray(
-	value: readonly string[] | "missing" | "auth-error" | AregErrorInfo,
-): value is readonly string[] {
-	return Array.isArray(value);
-}
-
-function copyInstalledSkill(skill: AregSkillxInstalledSkill): AregSkillxInstalledSkill {
-	return {
-		name: skill.name,
-		directory: skill.directory,
-		skillFile: skill.skillFile,
-		relativeFiles: [...skill.relativeFiles],
-	};
-}
-
 function copyErrorInfo(error: AregErrorInfo): AregErrorInfo {
-	return error.displayCommand === undefined
-		? { code: error.code, message: error.message }
-		: { code: error.code, message: error.message, displayCommand: error.displayCommand };
+	return { code: error.code, message: error.message };
 }