johns-harness 2026.9.12 → 2026.9.14

package/README.md

@@ -53,6 +53,13 @@ Enable "Device code authorization for Codex" once in chatgpt.com > Settings > Se
 For headless installs, run `johnness models auth login --device`; no browser or localhost callback needed.
 Expired ChatGPT credentials trigger an owner notice with the `/login` recovery command.
 
+<!-- JOHNNESS_PATCH_DEFAULTS_61 -->
+### Batteries included
+The harness ships the current model catalog and the short aliases `opus`, `sonnet`, `fable`, `astra`, `sol`, `luna`, `terra`, and `gpt`, so `/model opus` works on a fresh install with no `models.providers` block. Channels you configure load without a `plugins.allow` list; only an explicit `enabled: false` or `plugins.deny` turns one off. Updating the harness updates the catalog and aliases for every agent. Image generation and editing use GPT Image 2 through the `image_generate` tool: `openai-codex/gpt-image-2` on the ChatGPT subscription first, `openai/gpt-image-2` on the API key second (`agents.defaults.imageGenerationModel`).
+
+### Updating from chat
+Send `/update` to install the newest `johns-harness` on the machine the gateway runs on and restart into it; `/update 2026.9.14` pins an exact version. Owner only. The reply names the current and target versions, a second `/update` while one is running is refused, and the first message after the restart confirms the running version. On a writable host the package is reinstalled into the existing global prefix. On an immutable image with a persistent volume (Fly), it is installed into `$JOHNNESS_STATE_DIR/runtime/johnness` and the entrypoint prefers that runtime when it is newer than the image: `exec node "$(node /opt/johnness/lib/node_modules/johns-harness/dist/runtime-path.js)" gateway run`. `JOHNNESS_UPDATE_PREFIX` overrides the target. On failure the reply carries the last lines of npm output and the one command that fixes it.
+
 ### From source
 
 ```bash
@@ -64,8 +71,8 @@ node johnness.mjs --help
 ### Verify
 
 ```bash
-npm test                        # 701 tests against the installed dependency tree
-bash scripts/verify-patches.sh  # 258 checks across every patch family
+npm test                        # 767 tests against the installed dependency tree
+bash scripts/verify-patches.sh  # 360 checks across every patch family
 ```
 
 ## Launch a swarm with one command
@@ -111,7 +118,7 @@ Coding agents today run as isolated processes. Two agents on the same repository
 - **Memory built for production.** Tiered recall that traces from consolidated reflections down to the verbatim record, surviving compaction and shared across the swarm. Installed and enabled by default.
 - **Production authority per commit.** Promotion is granted to an exact SHA, never to a branch name, so one worker's authorization never covers another worker's commits.
 - **An append-only action log.** Agents record every consequential action to `ACTION_LOG.md` and read it before acting.
-- **A fixed runtime surface.** The core does not grow on a schedule. New mechanisms enter only to solve a demonstrated production failure, one narrow, tested, reversible patch at a time: 59 patch families, each with a regression test and a rollback path.
+- **A fixed runtime surface.** The core does not grow on a schedule. New mechanisms enter only to solve a demonstrated production failure, one narrow, tested, reversible patch at a time: 62 patch families, each with a regression test and a rollback path.
 - **Reliability with a definition.** Bounded retries, explicit failure states, exact-once continuation, context-pressure recovery, durable delivery, and supervised gateway recovery.
 - **Coding first, phone optional.** Direct the work at a high level from a chat channel while agents plan, implement, test, coordinate, and stage releases unattended.
 - **Local voice.** Optional native Whisper transcription of inbound audio, entirely on your machine. Off by default. [Setup](docs/NATIVE-WHISPER-MUSE.md).
@@ -178,7 +185,7 @@ The log is a [`RULES.md`](RULES.md) workspace convention enforced through the ac
 
 ## Patch families
 
-The runtime carries 59 patch families. Each is a production fix applied at the source with a regression test, a durable patch marker, and a rollback path. A verifier runs 258 checks against the package tree and installed dependencies, and 701 tests run against the installed dependency tree.
+The runtime carries 62 patch families. Each is a production fix applied at the source with a regression test, a durable patch marker, and a rollback path. A verifier runs 360 checks against the package tree and installed dependencies, and 767 tests run against the installed dependency tree.
 
 Every family follows the same six steps: reproduce the failure, trace the exact runtime path, make the smallest source-level change that restores the invariant, add a regression test and a patch marker, run the verifier, and retain rollback artifacts. The full index: [`docs/PATCHES.md`](docs/PATCHES.md).
 
@@ -195,7 +202,7 @@ Every family follows the same six steps: reproduce the failure, trace the exact
 ## Documentation
 
 - [`docs/index.md`](docs/index.md): runtime docs, from gateway and channels to plugins, nodes, and CLI reference.
-- [`docs/PATCHES.md`](docs/PATCHES.md): the 59 patch families, one record each.
+- [`docs/PATCHES.md`](docs/PATCHES.md): the 62 patch families, one record each.
 - [`docs/NATIVE-WHISPER-MUSE.md`](docs/NATIVE-WHISPER-MUSE.md): local Whisper transcription setup.
 - [`RULES.md`](RULES.md): the default operating rules, including Rule Zero on production authorization.
 

package/dist/auth-profiles-5CHn7vq1.js

@@ -3536,6 +3536,9 @@ async function resolveImplicitBedrockProvider(params) {
 //#region src/agents/model-selection.ts
 const log$1 = createSubsystemLogger("model-selection");
 const ANTHROPIC_MODEL_ALIASES = {
+	"opus-5": "claude-opus-5", // JOHNNESS_PATCH_DEFAULTS_61
+	"sonnet-5": "claude-sonnet-5",
+	"fable-5.1": "claude-fable-5-1",
 	"opus-4.6": "claude-opus-4-6",
 	"opus-4.5": "claude-opus-4-5",
 	"sonnet-4.6": "claude-sonnet-4-6",
@@ -3683,6 +3686,16 @@ function resolveModelRefFromString(params) {
 			ref: aliasMatch.ref,
 			alias: aliasMatch.alias
 		};
+		// JOHNNESS_PATCH_DEFAULTS_61: fall back to the shipped aliases (opus, sonnet, fable,
+		// astra, sol, luna, terra, gpt) when the user config defines none.
+		const builtinTarget = DEFAULT_MODEL_ALIASES[aliasKey];
+		if (builtinTarget) {
+			const builtinRef = parseModelRef(builtinTarget, params.defaultProvider);
+			if (builtinRef) return {
+				ref: builtinRef,
+				alias: aliasKey
+			};
+		}
 	}
 	const parsed = parseModelRef(model, params.defaultProvider);
 	if (!parsed) return null;
@@ -5081,9 +5094,18 @@ let defaultWarnState = { warned: false };
 const DEFAULT_MODEL_ALIASES = {
 	muse: "meta/muse-spark-1.3", // JOHNNESS_PATCH_MUSE_SPARK
 	"muse-spark": "meta/muse-spark-1.3",
-	opus: "anthropic/claude-opus-4-6",
-	sonnet: "anthropic/claude-sonnet-4-6",
-	gpt: "openai/gpt-5.4",
+	// JOHNNESS_PATCH_DEFAULTS_61: current model aliases ship with the harness; user config
+	// aliases (agents.defaults.models[*].alias) still take precedence.
+	opus: "anthropic/claude-opus-5",
+	sonnet: "anthropic/claude-sonnet-5",
+	opus46: "anthropic/claude-opus-4-6",
+	sonnet46: "anthropic/claude-sonnet-4-6",
+	fable: "anthropic/claude-fable-5-1",
+	astra: "openai-codex/gpt-6-astra",
+	sol: "openai-codex/gpt-5.6-sol",
+	luna: "openai-codex/gpt-5.6-luna",
+	terra: "openai-codex/gpt-5.6-terra",
+	gpt: "openai-codex/gpt-5.5",
 	"gpt-mini": "openai/gpt-5-mini",
 	gemini: "google/gemini-3.1-pro-preview",
 	"gemini-flash": "google/gemini-3-flash-preview",
@@ -6421,6 +6443,17 @@ function applyLegacyAudioTranscriptionModel(params) {
 	params.changes.push(params.alreadySetMessage);
 }
 const LEGACY_CONFIG_MIGRATIONS_PART_2 = [
+	{
+		id: "agent.image-generation-model-v1",
+		describe: "Migrate agents.defaults.imageGenerationModel string to primary/fallbacks",
+		apply: (raw, changes) => {
+			const defaults = getRecord(getRecord(raw.agents)?.defaults);
+			if (!defaults || typeof defaults.imageGenerationModel !== "string") return;
+			const primary = defaults.imageGenerationModel.trim();
+			defaults.imageGenerationModel = primary ? { primary, fallbacks: [] } : void 0;
+			changes.push("Migrated agents.defaults.imageGenerationModel string to primary/fallbacks");
+		}
+	}, // JOHNNESS_PATCH_GPT_IMAGE_62
 	{
 		id: "agent.model-config-v2",
 		describe: "Migrate legacy agent.model/allowedModels/modelAliases/modelFallbacks/imageModelFallbacks to agent.models + model lists",
@@ -10854,6 +10887,7 @@ function isValidNonNegativeByteSizeString(value) {
 const AgentDefaultsSchema = z.object({
 	model: AgentModelSchema.optional(),
 	imageModel: AgentModelSchema.optional(),
+	imageGenerationModel: AgentModelSchema.optional(), // JOHNNESS_PATCH_GPT_IMAGE_62
 	pdfModel: AgentModelSchema.optional(),
 	pdfMaxBytesMb: z.number().positive().optional(),
 	pdfMaxPages: z.number().int().positive().optional(),
@@ -13762,6 +13796,7 @@ function validateConfigObjectWithPluginsBase(raw, opts) {
 			workspaceDir: resolveAgentWorkspaceDir(config, resolveDefaultAgentId(config)) ?? void 0
 		});
 		for (const diag of registry.diagnostics) {
+			if (diag.level === "info") continue; // JOHNNESS_PATCH_DEFAULTS_61
 			let path = diag.pluginId ? `plugins.entries.${diag.pluginId}` : "plugins";
 			if (!diag.pluginId && diag.message.includes("plugin path not found")) path = "plugins.load.paths";
 			const message = `${diag.pluginId ? `plugin ${diag.pluginId}` : "plugin"}: ${diag.message}`;

package/dist/commands-registry-C78-tPS3.js

@@ -1,3 +1,4 @@
+// JOHNNESS_PATCH_UPDATE_COMMAND_62
 // JOHNNESS_PATCH_DEVICE_LOGIN_60
 // JOHNNESS_PATCH_DEVICE_LOGIN_60B
 import { l as escapeRegExp } from "./utils-DC4zYvW0.js";
@@ -181,6 +182,19 @@ function buildChatCommands() {
 				captureRemaining: true
 			}]
 		}),
+		defineChatCommand({
+			key: "update",
+			nativeName: "update",
+			description: "Install the newest johns-harness and restart (owner only).",
+			textAlias: "/update",
+			category: "management",
+			args: [{
+				name: "version",
+				description: "Exact version to install (default latest)",
+				type: "string",
+				required: false
+			}]
+		}),
 		defineChatCommand({
 			key: "login",
 			nativeName: "login",

package/dist/commands-registry-D0Jkz-Sn.js

@@ -1,3 +1,4 @@
+// JOHNNESS_PATCH_UPDATE_COMMAND_62
 // JOHNNESS_PATCH_DEVICE_LOGIN_60
 // JOHNNESS_PATCH_DEVICE_LOGIN_60B
 import { D as isPlainObject, u as escapeRegExp } from "./logger-Bj0Xl6pn.js";
@@ -218,6 +219,19 @@ function buildChatCommands() {
 				captureRemaining: true
 			}]
 		}),
+		defineChatCommand({
+			key: "update",
+			nativeName: "update",
+			description: "Install the newest johns-harness and restart (owner only).",
+			textAlias: "/update",
+			category: "management",
+			args: [{
+				name: "version",
+				description: "Exact version to install (default latest)",
+				type: "string",
+				required: false
+			}]
+		}),
 		defineChatCommand({
 			key: "login",
 			nativeName: "login",

package/dist/commands-registry-DJWLO-6B.js

@@ -1,3 +1,4 @@
+// JOHNNESS_PATCH_UPDATE_COMMAND_62
 // JOHNNESS_PATCH_DEVICE_LOGIN_60
 // JOHNNESS_PATCH_DEVICE_LOGIN_60B
 import { D as isPlainObject, u as escapeRegExp } from "./logger-BW8uLq6f.js";
@@ -218,6 +219,19 @@ function buildChatCommands() {
 				captureRemaining: true
 			}]
 		}),
+		defineChatCommand({
+			key: "update",
+			nativeName: "update",
+			description: "Install the newest johns-harness and restart (owner only).",
+			textAlias: "/update",
+			category: "management",
+			args: [{
+				name: "version",
+				description: "Exact version to install (default latest)",
+				type: "string",
+				required: false
+			}]
+		}),
 		defineChatCommand({
 			key: "login",
 			nativeName: "login",

package/dist/commands-registry-l51VuG0m.js

@@ -1,3 +1,4 @@
+// JOHNNESS_PATCH_UPDATE_COMMAND_62
 // JOHNNESS_PATCH_DEVICE_LOGIN_60
 // JOHNNESS_PATCH_DEVICE_LOGIN_60B
 import { Bi as DEFAULT_PROVIDER, Or as resolveConfiguredModelRef, zi as DEFAULT_MODEL } from "./auth-profiles-5CHn7vq1.js";
@@ -181,6 +182,19 @@ function buildChatCommands() {
 				captureRemaining: true
 			}]
 		}),
+		defineChatCommand({
+			key: "update",
+			nativeName: "update",
+			description: "Install the newest johns-harness and restart (owner only).",
+			textAlias: "/update",
+			category: "management",
+			args: [{
+				name: "version",
+				description: "Exact version to install (default latest)",
+				type: "string",
+				required: false
+			}]
+		}),
 		defineChatCommand({
 			key: "login",
 			nativeName: "login",

package/dist/compact-B247y5Qt.js

@@ -1,3 +1,5 @@
+import { createImageGenerateTool } from "./image-generate.js";
+import { handleUpdateCommand } from "./update-command.js";
 // JOHNNESS_PATCH_DEVICE_LOGIN_60
 // JOHNNESS_PATCH_DEVICE_LOGIN_60B
 import { handleDeviceLoginCommand } from "./codex-oauth-device.js";
@@ -11283,6 +11285,7 @@ const TRUSTED_TOOL_RESULT_MEDIA = new Set([
 	"exec",
 	"gateway",
 	"image",
+	"image_generate",
 	"memory_get",
 	"memory_search",
 	"message",
@@ -15583,7 +15586,8 @@ function buildAgentSystemPrompt(params) {
 		sessions_spawn: acpSpawnRuntimeEnabled ? "Spawn an isolated sub-agent or ACP coding session (runtime=\"acp\" requires `agentId` unless `acp.defaultAgent` is configured; ACP harness ids follow acp.allowedAgents, not agents_list)" : "Spawn an isolated sub-agent session",
 		subagents: "List, steer, or kill sub-agent runs for this requester session",
 		session_status: "Show a /status-equivalent status card (usage + time + Reasoning/Verbose/Elevated); use for model-use questions (📊 session_status); optional per-session model override",
-		image: "Analyze an image with the configured image model"
+		image: "Analyze an image with the configured image model",
+		image_generate: "Generate or edit images with GPT Image 2 (subscription first, API key second)"
 	};
 	const toolOrder = [
 		"read",
@@ -15610,7 +15614,8 @@ function buildAgentSystemPrompt(params) {
 		"sessions_send",
 		"subagents",
 		"session_status",
-		"image"
+		"image",
+		"image_generate"
 	];
 	const canonicalToolNames = (params.toolNames ?? []).map((tool) => tool.trim()).filter(Boolean);
 	const canonicalByNormalized = /* @__PURE__ */ new Map();
@@ -40979,6 +40984,8 @@ function resolveSessionEntryForHookSessionKey(sessionStore, sessionKey) {
 async function handleCommands(params) {
 	const deviceLoginReply = await handleDeviceLoginCommand(params, shouldHandleTextCommands({ cfg: params.cfg, surface: params.command.surface, commandSource: params.ctx.CommandSource }), { routeReply, callGateway });
 	if (deviceLoginReply) return deviceLoginReply;
+	const updateReply = await handleUpdateCommand(params, shouldHandleTextCommands({ cfg: params.cfg, surface: params.command.surface, commandSource: params.ctx.CommandSource }), { routeReply, callGateway, writeRestartSentinel, extractDeliveryInfo, restart: () => scheduleGatewaySigusr1Restart({ reason: "/update" }) }); // JOHNNESS_PATCH_UPDATE_COMMAND_62
+	if (updateReply) return updateReply;
 	if (HANDLERS === null) HANDLERS = [
 		handlePluginCommand,
 		handleBashCommand,
@@ -55646,6 +55653,16 @@ function createJohnnessTools(options) {
 		fsPolicy: options?.fsPolicy,
 		modelHasVision: options?.modelHasVision
 	}) : null;
+	const imageGenerateTool = options?.agentDir?.trim() ? createImageGenerateTool({
+		config: options?.config,
+		agentDir: options.agentDir,
+		workspaceDir,
+		sandbox: options?.sandboxRoot && options?.sandboxFsBridge ? { root: options.sandboxRoot, bridge: options.sandboxFsBridge } : void 0
+	}, {
+		resolveApiKeyForProvider,
+		loadWebMedia,
+		localRoots: resolveMediaToolLocalRoots(workspaceDir, { workspaceOnly: options?.fsPolicy?.workspaceOnly === true })
+	}) : null; // JOHNNESS_PATCH_GPT_IMAGE_62
 	const pdfTool = options?.agentDir?.trim() ? createPdfTool({
 		config: options?.config,
 		agentDir: options.agentDir,
@@ -55765,6 +55782,7 @@ function createJohnnessTools(options) {
 		...webSearchTool ? [webSearchTool] : [],
 		...webFetchTool ? [webFetchTool] : [],
 		...imageTool ? [imageTool] : [],
+		...imageGenerateTool ? [imageGenerateTool] : [],
 		...pdfTool ? [pdfTool] : []
 	];
 	const pluginTools = resolvePluginTools({
@@ -92632,7 +92650,10 @@ function isTrackedByProvenance(params) {
 function warnWhenAllowlistIsOpen(params) {
 	if (!params.pluginsEnabled) return;
 	if (params.allow.length > 0) return;
-	const nonBundled = params.discoverablePlugins.filter((entry) => entry.origin !== "bundled");
+	// JOHNNESS_PATCH_DEFAULTS_61: plugins the config already implies (memory slot, enabled
+	// entries, install records) are trusted by construction and never warned about.
+	const implied = params.impliedIds ?? new Set();
+	const nonBundled = params.discoverablePlugins.filter((entry) => entry.origin !== "bundled" && !implied.has(entry.id));
 	if (nonBundled.length === 0) return;
 	const preview = nonBundled.slice(0, 6).map((entry) => `${entry.id} (${entry.source})`).join(", ");
 	const extra = nonBundled.length > 6 ? ` (+${nonBundled.length - 6} more)` : "";
@@ -92730,6 +92751,11 @@ function loadJohnnessPlugins(options = {}) {
 		logger,
 		pluginsEnabled: normalized.enabled,
 		allow: normalized.allow,
+		impliedIds: new Set([
+			...typeof normalized.slots.memory === "string" ? [normalized.slots.memory] : [],
+			...Object.entries(normalized.entries).filter(([, entry]) => entry?.enabled === true).map(([id]) => id),
+			...Object.keys(cfg.plugins?.installs ?? {})
+		]), // JOHNNESS_PATCH_DEFAULTS_61
 		discoverablePlugins: manifestRegistry.plugins.map((plugin) => ({
 			id: plugin.id,
 			source: plugin.source,

package/dist/config-koj5M_EO.js

@@ -1573,6 +1573,9 @@ function normalizeGoogleModelId(id) {
 }
 createSubsystemLogger("model-selection");
 const ANTHROPIC_MODEL_ALIASES = {
+	"opus-5": "claude-opus-5", // JOHNNESS_PATCH_DEFAULTS_61
+	"sonnet-5": "claude-sonnet-5",
+	"fable-5.1": "claude-fable-5-1",
 	"opus-4.6": "claude-opus-4-6",
 	"opus-4.5": "claude-opus-4-5",
 	"sonnet-4.6": "claude-sonnet-4-6",
@@ -1788,9 +1791,18 @@ let defaultWarnState = { warned: false };
 const DEFAULT_MODEL_ALIASES = {
 	muse: "meta/muse-spark-1.3", // JOHNNESS_PATCH_MUSE_SPARK
 	"muse-spark": "meta/muse-spark-1.3",
-	opus: "anthropic/claude-opus-4-6",
-	sonnet: "anthropic/claude-sonnet-4-6",
-	gpt: "openai/gpt-5.4",
+	// JOHNNESS_PATCH_DEFAULTS_61: current model aliases ship with the harness; user config
+	// aliases (agents.defaults.models[*].alias) still take precedence.
+	opus: "anthropic/claude-opus-5",
+	sonnet: "anthropic/claude-sonnet-5",
+	opus46: "anthropic/claude-opus-4-6",
+	sonnet46: "anthropic/claude-sonnet-4-6",
+	fable: "anthropic/claude-fable-5-1",
+	astra: "openai-codex/gpt-6-astra",
+	sol: "openai-codex/gpt-5.6-sol",
+	luna: "openai-codex/gpt-5.6-luna",
+	terra: "openai-codex/gpt-5.6-terra",
+	gpt: "openai-codex/gpt-5.5",
 	"gpt-mini": "openai/gpt-5-mini",
 	gemini: "google/gemini-3.1-pro-preview",
 	"gemini-flash": "google/gemini-3-flash-preview",
@@ -3120,6 +3132,17 @@ function applyLegacyAudioTranscriptionModel(params) {
 	params.changes.push(params.alreadySetMessage);
 }
 const LEGACY_CONFIG_MIGRATIONS_PART_2 = [
+	{
+		id: "agent.image-generation-model-v1",
+		describe: "Migrate agents.defaults.imageGenerationModel string to primary/fallbacks",
+		apply: (raw, changes) => {
+			const defaults = getRecord(getRecord(raw.agents)?.defaults);
+			if (!defaults || typeof defaults.imageGenerationModel !== "string") return;
+			const primary = defaults.imageGenerationModel.trim();
+			defaults.imageGenerationModel = primary ? { primary, fallbacks: [] } : void 0;
+			changes.push("Migrated agents.defaults.imageGenerationModel string to primary/fallbacks");
+		}
+	}, // JOHNNESS_PATCH_GPT_IMAGE_62
 	{
 		id: "agent.model-config-v2",
 		describe: "Migrate legacy agent.model/allowedModels/modelAliases/modelFallbacks/imageModelFallbacks to agent.models + model lists",
@@ -4407,7 +4430,9 @@ function isBundledChannelEnabledByChannelConfig(cfg, pluginId) {
 	if (!channelId) return false;
 	const entry = cfg.channels?.[channelId];
 	if (!entry || typeof entry !== "object" || Array.isArray(entry)) return false;
-	return entry.enabled === true;
+	// JOHNNESS_PATCH_DEFAULTS_61: a configured channel block implies the bundled channel
+	// plugin. Only an explicit enabled:false opts out; no plugins.allow needed.
+	return entry.enabled !== false;
 }
 function resolveEffectiveEnableState(params) {
 	const base = resolveEnableState(params.id, params.origin, params.config);
@@ -5091,6 +5116,18 @@ function safeStatMtimeMs(filePath) {
 		return null;
 	}
 }
+// JOHNNESS_PATCH_DEFAULTS_61: loose semver compare for bundled-vs-installed plugin dedupe.
+function compareJohnnessPluginVersions(a, b) {
+	const parse = (value) => String(value ?? "").trim().replace(/^v/i, "").split(/[-+]/)[0].split(".").map((part) => Number.parseInt(part, 10)).map((part) => Number.isFinite(part) ? part : 0);
+	const left = parse(a);
+	const right = parse(b);
+	const len = Math.max(left.length, right.length, 1);
+	for (let i = 0; i < len; i += 1) {
+		const diff = (left[i] ?? 0) - (right[i] ?? 0);
+		if (diff !== 0) return diff > 0 ? 1 : -1;
+	}
+	return 0;
+}
 function normalizeManifestLabel(raw) {
 	const trimmed = raw?.trim();
 	return trimmed ? trimmed : void 0;
@@ -5187,6 +5224,39 @@ function loadPluginManifestRegistry(params) {
 				}
 				continue;
 			}
+			// JOHNNESS_PATCH_DEFAULTS_61: the same plugin id bundled with the harness and installed
+			// under the state dir is the normal shape (mr-memory). The installed copy stays
+			// authoritative (family 59) with no warning; when the bundled copy is newer by
+			// package version, one info line suggests updating. Two non-bundled copies
+			// still warn as before.
+			const existingBundled = existing.candidate.origin === "bundled";
+			const candidateBundled = candidate.origin === "bundled";
+			if (existingBundled !== candidateBundled) {
+				const existingRecord = records[existing.recordIndex];
+				const candidateVersion = normalizeManifestLabel(manifest.version) ?? candidate.packageVersion;
+				const bundledVersion = existingBundled ? existingRecord?.version : candidateVersion;
+				const installedVersion = existingBundled ? candidateVersion : existingRecord?.version;
+				if (existingBundled) {
+					records[existing.recordIndex] = buildRecord({
+						manifest,
+						candidate,
+						manifestPath: manifestRes.manifestPath,
+						schemaCacheKey,
+						configSchema
+					});
+					seenIds.set(manifest.id, {
+						candidate,
+						recordIndex: existing.recordIndex
+					});
+				}
+				if (compareJohnnessPluginVersions(bundledVersion, installedVersion) > 0) diagnostics.push({
+					level: "info",
+					pluginId: manifest.id,
+					source: candidate.source,
+					message: `installed copy ${installedVersion ?? "?"} is older than the bundled ${bundledVersion ?? "?"}; run "johnness plugins update ${manifest.id}" to upgrade`
+				});
+				continue;
+			}
 			diagnostics.push({
 				level: "warn",
 				pluginId: manifest.id,
@@ -6703,6 +6773,7 @@ function isValidNonNegativeByteSizeString(value) {
 const AgentDefaultsSchema = z.object({
 	model: AgentModelSchema.optional(),
 	imageModel: AgentModelSchema.optional(),
+	imageGenerationModel: AgentModelSchema.optional(), // JOHNNESS_PATCH_GPT_IMAGE_62
 	pdfModel: AgentModelSchema.optional(),
 	pdfMaxBytesMb: z.number().positive().optional(),
 	pdfMaxPages: z.number().int().positive().optional(),
@@ -9576,6 +9647,7 @@ function validateConfigObjectWithPluginsBase(raw, opts) {
 			workspaceDir: resolveAgentWorkspaceDir(config, resolveDefaultAgentId(config)) ?? void 0
 		});
 		for (const diag of registry.diagnostics) {
+			if (diag.level === "info") continue; // JOHNNESS_PATCH_DEFAULTS_61
 			let path = diag.pluginId ? `plugins.entries.${diag.pluginId}` : "plugins";
 			if (!diag.pluginId && diag.message.includes("plugin path not found")) path = "plugins.load.paths";
 			const message = `${diag.pluginId ? `plugin ${diag.pluginId}` : "plugin"}: ${diag.message}`;

package/dist/daemon-cli.js

@@ -4724,6 +4724,9 @@ function normalizeGoogleModelId(id) {
 }
 createSubsystemLogger("model-selection");
 const ANTHROPIC_MODEL_ALIASES = {
+	"opus-5": "claude-opus-5", // JOHNNESS_PATCH_DEFAULTS_61
+	"sonnet-5": "claude-sonnet-5",
+	"fable-5.1": "claude-fable-5-1",
 	"opus-4.6": "claude-opus-4-6",
 	"opus-4.5": "claude-opus-4-5",
 	"sonnet-4.6": "claude-sonnet-4-6",
@@ -4939,9 +4942,18 @@ let defaultWarnState = { warned: false };
 const DEFAULT_MODEL_ALIASES = {
 	muse: "meta/muse-spark-1.3", // JOHNNESS_PATCH_MUSE_SPARK
 	"muse-spark": "meta/muse-spark-1.3",
-	opus: "anthropic/claude-opus-4-6",
-	sonnet: "anthropic/claude-sonnet-4-6",
-	gpt: "openai/gpt-5.4",
+	// JOHNNESS_PATCH_DEFAULTS_61: current model aliases ship with the harness; user config
+	// aliases (agents.defaults.models[*].alias) still take precedence.
+	opus: "anthropic/claude-opus-5",
+	sonnet: "anthropic/claude-sonnet-5",
+	opus46: "anthropic/claude-opus-4-6",
+	sonnet46: "anthropic/claude-sonnet-4-6",
+	fable: "anthropic/claude-fable-5-1",
+	astra: "openai-codex/gpt-6-astra",
+	sol: "openai-codex/gpt-5.6-sol",
+	luna: "openai-codex/gpt-5.6-luna",
+	terra: "openai-codex/gpt-5.6-terra",
+	gpt: "openai-codex/gpt-5.5",
 	"gpt-mini": "openai/gpt-5-mini",
 	gemini: "google/gemini-3.1-pro-preview",
 	"gemini-flash": "google/gemini-3-flash-preview",
@@ -6100,6 +6112,17 @@ function applyLegacyAudioTranscriptionModel(params) {
 	params.changes.push(params.alreadySetMessage);
 }
 const LEGACY_CONFIG_MIGRATIONS_PART_2 = [
+	{
+		id: "agent.image-generation-model-v1",
+		describe: "Migrate agents.defaults.imageGenerationModel string to primary/fallbacks",
+		apply: (raw, changes) => {
+			const defaults = getRecord(getRecord(raw.agents)?.defaults);
+			if (!defaults || typeof defaults.imageGenerationModel !== "string") return;
+			const primary = defaults.imageGenerationModel.trim();
+			defaults.imageGenerationModel = primary ? { primary, fallbacks: [] } : void 0;
+			changes.push("Migrated agents.defaults.imageGenerationModel string to primary/fallbacks");
+		}
+	}, // JOHNNESS_PATCH_GPT_IMAGE_62
 	{
 		id: "agent.model-config-v2",
 		describe: "Migrate legacy agent.model/allowedModels/modelAliases/modelFallbacks/imageModelFallbacks to agent.models + model lists",
@@ -7371,7 +7394,9 @@ function isBundledChannelEnabledByChannelConfig(cfg, pluginId) {
 	if (!channelId) return false;
 	const entry = cfg.channels?.[channelId];
 	if (!entry || typeof entry !== "object" || Array.isArray(entry)) return false;
-	return entry.enabled === true;
+	// JOHNNESS_PATCH_DEFAULTS_61: a configured channel block implies the bundled channel
+	// plugin. Only an explicit enabled:false opts out; no plugins.allow needed.
+	return entry.enabled !== false;
 }
 function resolveEffectiveEnableState(params) {
 	const base = resolveEnableState(params.id, params.origin, params.config);
@@ -8055,6 +8080,18 @@ function safeStatMtimeMs(filePath) {
 		return null;
 	}
 }
+// JOHNNESS_PATCH_DEFAULTS_61: loose semver compare for bundled-vs-installed plugin dedupe.
+function compareJohnnessPluginVersions(a, b) {
+	const parse = (value) => String(value ?? "").trim().replace(/^v/i, "").split(/[-+]/)[0].split(".").map((part) => Number.parseInt(part, 10)).map((part) => Number.isFinite(part) ? part : 0);
+	const left = parse(a);
+	const right = parse(b);
+	const len = Math.max(left.length, right.length, 1);
+	for (let i = 0; i < len; i += 1) {
+		const diff = (left[i] ?? 0) - (right[i] ?? 0);
+		if (diff !== 0) return diff > 0 ? 1 : -1;
+	}
+	return 0;
+}
 function normalizeManifestLabel(raw) {
 	const trimmed = raw?.trim();
 	return trimmed ? trimmed : void 0;
@@ -8151,6 +8188,39 @@ function loadPluginManifestRegistry(params) {
 				}
 				continue;
 			}
+			// JOHNNESS_PATCH_DEFAULTS_61: the same plugin id bundled with the harness and installed
+			// under the state dir is the normal shape (mr-memory). The installed copy stays
+			// authoritative (family 59) with no warning; when the bundled copy is newer by
+			// package version, one info line suggests updating. Two non-bundled copies
+			// still warn as before.
+			const existingBundled = existing.candidate.origin === "bundled";
+			const candidateBundled = candidate.origin === "bundled";
+			if (existingBundled !== candidateBundled) {
+				const existingRecord = records[existing.recordIndex];
+				const candidateVersion = normalizeManifestLabel(manifest.version) ?? candidate.packageVersion;
+				const bundledVersion = existingBundled ? existingRecord?.version : candidateVersion;
+				const installedVersion = existingBundled ? candidateVersion : existingRecord?.version;
+				if (existingBundled) {
+					records[existing.recordIndex] = buildRecord({
+						manifest,
+						candidate,
+						manifestPath: manifestRes.manifestPath,
+						schemaCacheKey,
+						configSchema
+					});
+					seenIds.set(manifest.id, {
+						candidate,
+						recordIndex: existing.recordIndex
+					});
+				}
+				if (compareJohnnessPluginVersions(bundledVersion, installedVersion) > 0) diagnostics.push({
+					level: "info",
+					pluginId: manifest.id,
+					source: candidate.source,
+					message: `installed copy ${installedVersion ?? "?"} is older than the bundled ${bundledVersion ?? "?"}; run "johnness plugins update ${manifest.id}" to upgrade`
+				});
+				continue;
+			}
 			diagnostics.push({
 				level: "warn",
 				pluginId: manifest.id,
@@ -9635,6 +9705,7 @@ function isValidNonNegativeByteSizeString(value) {
 const AgentDefaultsSchema = z.object({
 	model: AgentModelSchema.optional(),
 	imageModel: AgentModelSchema.optional(),
+	imageGenerationModel: AgentModelSchema.optional(), // JOHNNESS_PATCH_GPT_IMAGE_62
 	pdfModel: AgentModelSchema.optional(),
 	pdfMaxBytesMb: z.number().positive().optional(),
 	pdfMaxPages: z.number().int().positive().optional(),
@@ -12481,6 +12552,7 @@ function validateConfigObjectWithPluginsBase(raw, opts) {
 			workspaceDir: resolveAgentWorkspaceDir(config, resolveDefaultAgentId(config)) ?? void 0
 		});
 		for (const diag of registry.diagnostics) {
+			if (diag.level === "info") continue; // JOHNNESS_PATCH_DEFAULTS_61
 			let path = diag.pluginId ? `plugins.entries.${diag.pluginId}` : "plugins";
 			if (!diag.pluginId && diag.message.includes("plugin path not found")) path = "plugins.load.paths";
 			const message = `${diag.pluginId ? `plugin ${diag.pluginId}` : "plugin"}: ${diag.message}`;