@gajae-code/coding-agent 0.13.2 → 0.14.0

package/src/config/config-schema-version.ts

@@ -0,0 +1,10 @@
+/**
+ * The current settings/config schema version. A `config.yml` whose
+ * `configSchemaVersion` is newer is treated as read-only by Settings migrations
+ * (a future schema must not inherit stale keys); the workflow-settings
+ * resolver mirrors that guard when deciding whether a migration target is
+ * non-publishable (so the retained legacy fallback still applies). Defined in
+ * this dependency-light module so the resolver can import it without pulling in
+ * the TUI/AI-heavy settings schema.
+ */
+export const CONFIG_SCHEMA_VERSION = 1;

package/src/config/file-lock.ts

@@ -260,6 +260,27 @@ async function removeStaleLockForAcquire(lockPath: string, snapshot: LockStaleSn
 	}
 }
 
+/**
+ * @internal
+ * READ-ONLY verdict on an EXISTING generic `<file>.lock/` directory that another lock
+ * protocol has collided with: is its owner gone, by this protocol's own rules?
+ *
+ * Exposed so a foreign holder of the same path never has to reimplement this protocol's
+ * owner parsing or liveness rules. Reusing them is what makes the two implementations
+ * agree: `processStartTime` here is the portable `ps` value that `info.start_time` was
+ * written from, so a live owner is proved live rather than compared against a value from a
+ * different clock source and then reaped. A live owner is never reported stale by elapsed
+ * time alone.
+ *
+ * Deletion is deliberately NOT offered. This protocol can only re-read an owner token and
+ * then unlink a pathname, which a successor can take over in between; a caller that must
+ * remove the directory has to do it under an identity-bound primitive that refuses when
+ * the object is no longer the one that was judged.
+ */
+export async function genericFileLockDirIsStale(lockDir: string, staleMs: number): Promise<boolean> {
+	return (await staleLockSnapshot(lockDir, staleMs)).stale;
+}
+
 async function tryAcquireLock(
 	lockPath: string,
 	ownerHostId?: string,
@@ -310,6 +331,51 @@ async function releaseLock(lockPath: string, owner: FileLockOwnerToken): Promise
 	const outcome = await removeFileLockDirForGc(lockPath, owner);
 	if (outcome !== "removed") throw new Error(`Failed to release file lock: ${outcome}.`);
 }
+/**
+ * Bounded, actionable description of who holds `lockPath` at exhaustion time.
+ * Never a stealing authority: purely diagnostic, read once after the last retry.
+ */
+async function lockHolderDescription(lockPath: string): Promise<string> {
+	try {
+		const info = await readLockInfo(lockPath);
+		if (info) {
+			// A lock record carrying a foreign owner_host_id belongs to another
+			// machine (shared-volume topic registry): its pid is meaningful only
+			// on that host, so probing the same numeric pid here could mislabel a
+			// coincident local process as the holder. Report the owner host with
+			// unknown liveness instead.
+			if (info.owner_host_id !== undefined) {
+				return (
+					`held by pid ${info.pid} on host ${info.owner_host_id} (liveness unknown from this host)` +
+					` since ${new Date(info.timestamp).toISOString()}`
+				);
+			}
+			// Same-host holder: use the full liveness proof (pid alive AND, when the
+			// record carries a start_time, the start-time identity match) so a dead
+			// holder whose pid was already reused is not mislabeled "(live)".
+			const alive = ownerIsAlive(info);
+			return (
+				`held by pid ${info.pid}` +
+				(alive
+					? " (live)"
+					: ownerLiveness(info.pid) === "dead"
+						? " (dead but not reaped)"
+						: " (liveness unknown)") +
+				` since ${new Date(info.timestamp).toISOString()}`
+			);
+		}
+		try {
+			await fs.stat(path.join(lockPath, "info"));
+			return "held by an owner whose metadata is not yet readable";
+		} catch (error) {
+			if (!isEnoent(error)) throw error;
+		}
+		return "held by an unrecognized owner record";
+	} catch (error) {
+		return `held by an unreadable owner (${(error as Error).message})`;
+	}
+}
+
 async function acquireLock(filePath: string, options: FileLockOptions = {}): Promise<() => Promise<void>> {
 	if (options.ownerHostId !== undefined && !options.ownerHostId) throw new Error("ownerHostId must be non-empty");
 	const opts = { ...DEFAULT_OPTIONS, ...options };
@@ -335,7 +401,10 @@ async function acquireLock(filePath: string, options: FileLockOptions = {}): Pro
 			opts.signal.removeEventListener("abort", onAbort);
 		}
 	}
-	throw new Error(`Failed to acquire lock for ${filePath} after ${opts.retries} attempts`);
+	throw new Error(
+		`Failed to acquire lock for ${filePath} after ${opts.retries} attempts: ${await lockHolderDescription(lockPath)} (${lockPath}); ` +
+			`a live owner is never displaced — if this is an SDK broker (gjc sdk status), it must finish or be stopped before retrying`,
+	);
 }
 
 /**

package/src/config/mcp-schema.json

@@ -2,7 +2,7 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://raw.githubusercontent.com/Yeachan-Heo/gajae-code/main/packages/coding-agent/src/config/mcp-schema.json",
   "title": "GJC MCP configuration",
-  "description": "Schema for stored MCP server definitions in mcp.json, .mcp.json, .gjc/mcp.json, and ~/.gjc/agent/mcp.json. Normal standalone gjc sessions do not consume gjc mcp registrations as runtime tools today.",
+  "description": "Schema for stored MCP server definitions in mcp.json, .mcp.json, .gjc/mcp.json, and ~/.gjc/agent/mcp.json. Ordinary standalone gjc sessions consume enabled registrations at startup (conventional autoload); --no-mcp opts a session out.",
   "type": "object",
   "additionalProperties": false,
   "properties": {
@@ -40,11 +40,16 @@
     "authConfig": {
       "type": "object",
       "additionalProperties": false,
-      "required": ["type"],
+      "required": [
+        "type"
+      ],
       "properties": {
         "type": {
           "type": "string",
-          "enum": ["oauth", "apikey"],
+          "enum": [
+            "oauth",
+            "apikey"
+          ],
           "description": "Auth strategy understood by GJC."
         },
         "credentialId": {
@@ -98,11 +103,14 @@
         },
         "autoload": {
           "type": "boolean",
-          "description": "Whether an explicit runtime MCP consumer should connect this server automatically when that consumer starts (default: true). Normal standalone gjc, gjc --tmux, and print-mode sessions do not consume gjc mcp registrations today; false keeps the server configured for consumers that support explicit connection."
+          "description": "Whether an explicit runtime MCP consumer should connect this server automatically when that consumer starts (default: true). Ordinary standalone gjc, gjc --tmux, and print-mode sessions honor autoload for conventional registrations; false keeps the server configured for on-demand /mcp connection, and --no-mcp opts a session out."
         },
         "sharing": {
           "type": "string",
-          "enum": ["per-session", "shared"],
+          "enum": [
+            "per-session",
+            "shared"
+          ],
           "default": "per-session",
           "description": "MCP connection pool identity mode; W2 defaults to one connection per session."
         },
@@ -111,6 +119,16 @@
           "exclusiveMinimum": 0,
           "description": "Connection timeout in milliseconds."
         },
+        "protocol": {
+          "type": "string",
+          "enum": [
+            "auto",
+            "2026-07-28",
+            "legacy"
+          ],
+          "default": "auto",
+          "description": "Protocol preference for remote (http/sse) servers: auto negotiates MCP 2026-07-28 (stateless) first with a bounded observable legacy fallback; 2026-07-28 is strict modern-only; legacy forces the bounded compatibility handshake. Ignored by stdio servers."
+        },
         "auth": {
           "$ref": "#/$defs/authConfig"
         },
@@ -127,11 +145,15 @@
           "$ref": "#/$defs/serverBase"
         },
         {
-          "required": ["command"],
+          "required": [
+            "command"
+          ],
           "properties": {
             "type": {
               "type": "string",
-              "enum": ["stdio"],
+              "enum": [
+                "stdio"
+              ],
               "description": "Default transport when omitted."
             },
             "command": {
@@ -160,7 +182,9 @@
             }
           },
           "not": {
-            "required": ["url"]
+            "required": [
+              "url"
+            ]
           }
         }
       ]
@@ -173,11 +197,16 @@
           "$ref": "#/$defs/serverBase"
         },
         {
-          "required": ["type", "url"],
+          "required": [
+            "type",
+            "url"
+          ],
           "properties": {
             "type": {
               "type": "string",
-              "enum": ["http"],
+              "enum": [
+                "http"
+              ],
               "description": "Streamable HTTP transport."
             },
             "url": {
@@ -191,7 +220,9 @@
             }
           },
           "not": {
-            "required": ["command"]
+            "required": [
+              "command"
+            ]
           }
         }
       ]
@@ -204,11 +235,16 @@
           "$ref": "#/$defs/serverBase"
         },
         {
-          "required": ["type", "url"],
+          "required": [
+            "type",
+            "url"
+          ],
           "properties": {
             "type": {
               "type": "string",
-              "enum": ["sse"],
+              "enum": [
+                "sse"
+              ],
               "description": "Legacy SSE transport kept for compatibility. Prefer http for new configs."
             },
             "url": {
@@ -222,7 +258,9 @@
             }
           },
           "not": {
-            "required": ["command"]
+            "required": [
+              "command"
+            ]
           }
         }
       ]

package/src/config/model-profile-activation.ts

@@ -1,5 +1,6 @@
 import { ThinkingLevel } from "@gajae-code/agent-core";
 import type { Api, Model } from "@gajae-code/ai/core";
+import { logger } from "@gajae-code/utils";
 import type { AgentSession, DefaultFallbackRuntimeState } from "../session/agent-session";
 import { clampExplicitThinkingLevelForModel, formatClampedModelSelector } from "../thinking";
 import { validateModelProfileName } from "./model-profile-contract";
@@ -48,6 +49,8 @@ type ModelProfileActivationSession = Pick<
 	clearProfileInstalledOverrides?: () => void;
 	/** Current profile-installed override keys, for deriving the activation base. */
 	getProfileInstalledOverrideKeys?: () => { modelRoles: readonly string[]; agentModelOverrides: readonly string[] };
+	/** Re-apply vendor-separated delegation (task tool + prompt) after the role layer changed. */
+	syncEagerDelegation?: () => Promise<void>;
 	getSessionDefaultModelSelector?: () => string | undefined;
 	recordResumeDefaultModel?: (selector: string | undefined) => void;
 	seedDefaultFallbackResolution?: (activeIndex: number, skips: Array<{ selector: string; reason: string }>) => void;
@@ -92,6 +95,7 @@ export interface PrepareModelProfileActivationOptions {
 			Pick<
 				ModelRegistry,
 				| "getAvailable"
+				| "getAvailableForProfileActivation"
 				| "resolveModelByLookupAlias"
 				| "lookupAliasExists"
 				| "clearCanonicalVariant"
@@ -572,7 +576,9 @@ function rewriteSelectorForProxy(
 	const proxyModels = allModels.filter(model => model.provider === proxyProvider);
 	if (slash < 0) {
 		if (proxyMode === "fallback") return selector;
-		const matches = proxyModels.filter(model => model.id === baseSelector);
+		const exactMatches = proxyModels.filter(model => model.id === baseSelector);
+		const finalSegmentMatches = proxyModels.filter(model => model.id.split("/").at(-1) === baseSelector);
+		const matches = exactMatches.length > 0 ? exactMatches : finalSegmentMatches;
 		if (matches.length !== 1) {
 			throw new Error(
 				`Configured proxy "${proxyProvider}" does not expose an unambiguous model for "${baseSelector}"`,
@@ -950,7 +956,10 @@ export async function prepareModelProfileActivation(
 			);
 		}
 
-		const availableModels = options.modelRegistry.getAvailable?.() ?? options.modelRegistry.getAll();
+		const availableModels =
+			options.modelRegistry.getAvailableForProfileActivation?.() ??
+			options.modelRegistry.getAvailable?.() ??
+			options.modelRegistry.getAll();
 		let bindings = resolveProfileBindings(profile);
 		if (missingProviders.length > 0 && alternativeGroups.length > 0) {
 			bindings = rewriteBindingsProviders(bindings, new Set(authenticatedProviders), alternativeGroups);
@@ -1296,6 +1305,18 @@ export async function applyPreparedModelProfileActivation(
 		}
 		throw error;
 	}
+	// The installed role layer decides whether this profile is vendor-separated,
+	// so delegation must be re-applied to the live session rather than only to
+	// sessions started after activation. Activation itself already succeeded; a
+	// failed refresh must not roll it back.
+	try {
+		await prepared.session.syncEagerDelegation?.();
+	} catch (error) {
+		logger.warn("Failed to sync eager delegation after model profile activation", {
+			profile: prepared.profileName,
+			error: error instanceof Error ? error.message : String(error),
+		});
+	}
 }
 
 export interface MaterializeModelProfileForDeletionResult {

package/src/config/model-profiles.ts

@@ -106,6 +106,13 @@ export const BUILTIN_MODEL_PROFILES: readonly ModelProfileDefinition[] = [
 		critic: "opencode-go/mimo-v2.5-pro",
 		architect: "opencode-go/deepseek-v4-pro",
 	}),
+	profile("commandcode-goat", ["commandcode-goat"], {
+		default: "commandcode-goat/zai-org/GLM-5.3",
+		executor: "commandcode-goat/deepseek/deepseek-v4-flash",
+		planner: "commandcode-goat/moonshotai/Kimi-K3",
+		critic: "commandcode-goat/zai-org/GLM-5.2",
+		architect: "commandcode-goat/deepseek/deepseek-v4-pro",
+	}),
 	profile("open-weights-glm", [], {
 		default: "glm-5.2:medium",
 		executor: "glm-5.2:low",
@@ -134,6 +141,27 @@ export const BUILTIN_MODEL_PROFILES: readonly ModelProfileDefinition[] = [
 		critic: "gpt-5.6-luna:xhigh",
 		architect: "gpt-5.6-luna:xhigh",
 	}),
+	profile("open-weights-spark", [], {
+		default: "muse-spark-1.2:medium",
+		executor: "muse-spark-1.2:low",
+		planner: "muse-spark-1.2:high",
+		critic: "muse-spark-1.2:high",
+		architect: "muse-spark-1.2:xhigh",
+	}),
+	profile("open-weights-spark-deepseek", [], {
+		default: "muse-spark-1.2:medium",
+		executor: "deepseek-v4-flash:high",
+		planner: "muse-spark-1.2:high",
+		critic: "muse-spark-1.2:high",
+		architect: "muse-spark-1.2:xhigh",
+	}),
+	profile("open-weights-spark-luna", [], {
+		default: "muse-spark-1.2:medium",
+		executor: "gpt-5.6-luna:high",
+		planner: "muse-spark-1.2:high",
+		critic: "muse-spark-1.2:high",
+		architect: "muse-spark-1.2:xhigh",
+	}),
 	profile("open-weights-glm-deepseek", [], {
 		default: "glm-5.2:medium",
 		executor: "deepseek-v4-flash:high",
@@ -170,11 +198,11 @@ export const BUILTIN_MODEL_PROFILES: readonly ModelProfileDefinition[] = [
 		architect: "gpt-5.6-luna:xhigh",
 	}),
 	profile("claude-opus", ["anthropic"], {
-		default: "anthropic/claude-opus-5:xhigh",
+		default: ["anthropic/claude-opus-5:xhigh", "anthropic/claude-opus-4-6:xhigh"],
 		executor: "anthropic/claude-sonnet-5",
-		planner: "anthropic/claude-opus-5:low",
-		critic: "anthropic/claude-opus-5:high",
-		architect: "anthropic/claude-opus-5:xhigh",
+		planner: ["anthropic/claude-opus-5:low", "anthropic/claude-opus-4-6:low"],
+		critic: ["anthropic/claude-opus-5:high", "anthropic/claude-opus-4-6:high"],
+		architect: ["anthropic/claude-opus-5:xhigh", "anthropic/claude-opus-4-6:xhigh"],
 	}),
 	profile("claude-fable", ["anthropic"], {
 		default: "anthropic/claude-fable-5:xhigh",
@@ -184,25 +212,25 @@ export const BUILTIN_MODEL_PROFILES: readonly ModelProfileDefinition[] = [
 		architect: "anthropic/claude-fable-5:xhigh",
 	}),
 	profile("glm-eco", ["zai"], {
-		default: "zai/glm-5.2:low",
-		executor: "zai/glm-5.2:minimal",
-		planner: "zai/glm-5.2:low",
-		critic: "zai/glm-5.2:medium",
-		architect: "zai/glm-5.2:high",
+		default: "zai/glm-5.3:low",
+		executor: "zai/glm-5.3:low",
+		planner: "zai/glm-5.3:low",
+		critic: "zai/glm-5.3:high",
+		architect: "zai/glm-5.3:high",
 	}),
 	profile("glm-medium", ["zai"], {
-		default: "zai/glm-5.2:medium",
-		executor: "zai/glm-5.2:low",
-		planner: "zai/glm-5.2:medium",
-		critic: "zai/glm-5.2:high",
-		architect: "zai/glm-5.2:xhigh",
+		default: "zai/glm-5.3:high",
+		executor: "zai/glm-5.3:low",
+		planner: "zai/glm-5.3:high",
+		critic: "zai/glm-5.3:high",
+		architect: "zai/glm-5.3:max",
 	}),
 	profile("glm-pro", ["zai"], {
-		default: "zai/glm-5.2:xhigh",
-		executor: "zai/glm-5.2:medium",
-		planner: "zai/glm-5.2:high",
-		critic: "zai/glm-5.2:xhigh",
-		architect: "zai/glm-5.2:xhigh",
+		default: "zai/glm-5.3:max",
+		executor: "zai/glm-5.3:high",
+		planner: "zai/glm-5.3:high",
+		critic: "zai/glm-5.3:max",
+		architect: "zai/glm-5.3:max",
 	}),
 	profile("kimi-coding-plan-eco", ["kimi-code"], {
 		default: "kimi-code/k3:low",
@@ -279,7 +307,7 @@ export const BUILTIN_MODEL_PROFILES: readonly ModelProfileDefinition[] = [
 	}),
 	profile("grok-45-eco", ["xai"], {
 		default: "xai/grok-4.5:low",
-		executor: "xai/grok-4.5:minimal",
+		executor: "xai/grok-4.5:low",
 		planner: "xai/grok-4.5:low",
 		critic: "xai/grok-4.5:medium",
 		architect: "xai/grok-4.5:high",
@@ -298,6 +326,27 @@ export const BUILTIN_MODEL_PROFILES: readonly ModelProfileDefinition[] = [
 		critic: "xai/grok-4.5:high",
 		architect: "xai/grok-4.5:high",
 	}),
+	profile("grok-46-eco", ["xai"], {
+		default: "xai/grok-4.6:low",
+		executor: "xai/grok-4.6:low",
+		planner: "xai/grok-4.6:low",
+		critic: "xai/grok-4.6:medium",
+		architect: "xai/grok-4.6:high",
+	}),
+	profile("grok-46-medium", ["xai"], {
+		default: "xai/grok-4.6:medium",
+		executor: "xai/grok-4.6:low",
+		planner: "xai/grok-4.6:medium",
+		critic: "xai/grok-4.6:high",
+		architect: "xai/grok-4.6:high",
+	}),
+	profile("grok-46-pro", ["xai"], {
+		default: "xai/grok-4.6:xhigh",
+		executor: "xai/grok-4.6:medium",
+		planner: "xai/grok-4.6:high",
+		critic: "xai/grok-4.6:xhigh",
+		architect: "xai/grok-4.6:xhigh",
+	}),
 	profile("grok-build-pro", ["grok-build"], {
 		default: "grok-build/grok-composer-2.5-fast",
 		executor: "grok-build/grok-build",
@@ -437,6 +486,7 @@ const PROFILE_PRESENTATION: Record<string, ModelProfilePresentation> = {
 	"codex-pro": { displayName: "Codex Pro", providerGroup: "CODEX" },
 	lunamaxxing: { displayName: "LunaMaxxing", providerGroup: "CODEX" },
 	opencodego: { displayName: "OpenCodeGo", providerGroup: "OPENCODEGO" },
+	"commandcode-goat": { displayName: "Command Code GOAT", providerGroup: "COMMAND CODE GOAT" },
 	"open-weights-glm": { displayName: "GLM", providerGroup: "OPEN WEIGHT MODELS (PROVIDER AGNOSTIC)" },
 	"open-weights-deepseek": {
 		displayName: "DeepSeek",
@@ -444,6 +494,15 @@ const PROFILE_PRESENTATION: Record<string, ModelProfilePresentation> = {
 	},
 	"open-weights-kimi": { displayName: "Kimi", providerGroup: "OPEN WEIGHT MODELS (PROVIDER AGNOSTIC)" },
 	"open-weights-luna": { displayName: "Luna", providerGroup: "OPEN WEIGHT MODELS (PROVIDER AGNOSTIC)" },
+	"open-weights-spark": { displayName: "Muse Spark", providerGroup: "OPEN WEIGHT MODELS (PROVIDER AGNOSTIC)" },
+	"open-weights-spark-deepseek": {
+		displayName: "Muse Spark + DeepSeek",
+		providerGroup: "OPEN WEIGHT MODELS (PROVIDER AGNOSTIC)",
+	},
+	"open-weights-spark-luna": {
+		displayName: "Muse Spark + Luna",
+		providerGroup: "OPEN WEIGHT MODELS (PROVIDER AGNOSTIC)",
+	},
 	"open-weights-glm-deepseek": {
 		displayName: "GLM + DeepSeek",
 		providerGroup: "OPEN WEIGHT MODELS (PROVIDER AGNOSTIC)",
@@ -481,6 +540,9 @@ const PROFILE_PRESENTATION: Record<string, ModelProfilePresentation> = {
 	"grok-45-eco": { displayName: "Grok 4.5 Eco", providerGroup: "GROK" },
 	"grok-45-medium": { displayName: "Grok 4.5 Medium", providerGroup: "GROK" },
 	"grok-45-pro": { displayName: "Grok 4.5 Pro", providerGroup: "GROK" },
+	"grok-46-eco": { displayName: "Grok 4.6 Eco", providerGroup: "GROK" },
+	"grok-46-medium": { displayName: "Grok 4.6 Medium", providerGroup: "GROK" },
+	"grok-46-pro": { displayName: "Grok 4.6 Pro", providerGroup: "GROK" },
 	"grok-build-pro": { displayName: "Grok Build Pro", providerGroup: "GROK" },
 	"cursor-eco": { displayName: "Cursor Eco", providerGroup: "CURSOR" },
 	"cursor-medium": { displayName: "Cursor Medium", providerGroup: "CURSOR" },
@@ -501,6 +563,7 @@ const PROFILE_PRESENTATION: Record<string, ModelProfilePresentation> = {
 const PROFILE_GROUP_ORDER = [
 	"CODEX",
 	"OPENCODEGO",
+	"COMMAND CODE GOAT",
 	"OPEN WEIGHT MODELS (PROVIDER AGNOSTIC)",
 	"CLAUDE",
 	"GLM",
@@ -518,6 +581,9 @@ const OPEN_WEIGHT_PROFILE_ORDER = [
 	"open-weights-deepseek",
 	"open-weights-kimi",
 	"open-weights-luna",
+	"open-weights-spark",
+	"open-weights-spark-deepseek",
+	"open-weights-spark-luna",
 	"open-weights-glm-deepseek",
 	"open-weights-kimi-deepseek",
 	"open-weights-kimi-glm",
@@ -530,13 +596,14 @@ const PROFILE_RECOMMENDATIONS: Record<string, string> = {
 	"openai-codex": "codex-medium",
 	anthropic: "claude-opus",
 	"opencode-go": "opencodego",
+	"commandcode-goat": "commandcode-goat",
 	zai: "glm-medium",
 	"kimi-code": "kimi-coding-plan-medium",
 	xiaomi: "mimo-medium",
 	"xiaomi-token-plan-sgp": "mimo-medium",
 	"xiaomi-token-plan-ams": "mimo-medium",
 	"xiaomi-token-plan-cn": "mimo-medium",
-	xai: "grok-medium",
+	xai: "grok-46-medium",
 	"grok-build": "grok-build-pro",
 	cursor: "cursor-medium",
 	"minimax-code": "minimax-medium",