@gajae-code/coding-agent 0.13.3 → 0.14.0

package/src/main.ts

@@ -33,7 +33,7 @@ import { ModelRegistry, ModelsConfigFile } from "./config/model-registry";
 import { resolveCliModel, resolveModelRoleValue, resolveModelScope, type ScopedModel } from "./config/model-resolver";
 import { selectorHead } from "./config/model-selector-value";
 import { getDefault, type SettingPath, Settings, settings } from "./config/settings";
-import { distTagForChannel, type UpdateChannel } from "./config/update-channel";
+import { distTagForChannel, resolveMachineLocalUpdateChannel, type UpdateChannel } from "./config/update-channel";
 import { BUNDLED_GROK_BUILD_EXTENSION_ID, getBundledGrokBuildExtensionFactory } from "./defaults/gjc-grok-cli";
 import { initializeWithSettings } from "./discovery";
 import { exportFromFile } from "./export/html";
@@ -56,7 +56,6 @@ import {
 } from "./sdk";
 import { processIncarnation } from "./sdk/broker/process-incarnation";
 import { SessionIndex } from "./sdk/broker/session-index";
-
 import type { AgentSession } from "./session/agent-session";
 import { SessionMigrationBusyError } from "./session/internal/session-open-errors";
 import {
@@ -79,6 +78,7 @@ import { persistTaskTokenLog, resolveTaskTokenLogDir, taskTokenLogFromUsage } fr
 import type { LspStartupServerInfo } from "./tools";
 import { getDisplayChangelogEntries, getInstalledVersionChangelogEntry, getNewEntries } from "./utils/changelog";
 import type { EventBus } from "./utils/event-bus";
+import { installHerdrReporter } from "./utils/herdr-pane";
 import { fetchLatestPackageVersion } from "./utils/npm-registry";
 
 const MANAGED_OWNER_SUPERVISOR_ARG = "--internal-managed-owner-supervisor";
@@ -197,6 +197,7 @@ export function resolveAcpStartupOptions(
 		| "apiKey"
 		| "appendSystemPrompt"
 		| "credential"
+		| "preferCredential"
 		| "continue"
 		| "default"
 		| "cwd"
@@ -209,6 +210,7 @@ export function resolveAcpStartupOptions(
 		| "model"
 		| "models"
 		| "noLsp"
+		| "noMcp"
 		| "noPty"
 		| "noRules"
 		| "noSession"
@@ -240,6 +242,7 @@ export function resolveAcpStartupOptions(
 		...(parsed.apiKey ? ["--api-key"] : []),
 		...(parsed.appendSystemPrompt ? ["--append-system-prompt"] : []),
 		...(parsed.credential ? ["--credential"] : []),
+		...(parsed.preferCredential ? ["--prefer-credential"] : []),
 		...(parsed.continue ? ["--continue"] : []),
 		...(parsed.cwd ? ["--cwd"] : []),
 		...(parsed.fileArgs.length > 0 ? ["@file"] : []),
@@ -248,6 +251,7 @@ export function resolveAcpStartupOptions(
 		...(parsed.messages.length > 0 ? ["initial prompt"] : []),
 		...(parsed.models?.length ? ["--models"] : []),
 		...(parsed.mcpConfig !== undefined ? ["--mcp-config"] : []),
+		...(parsed.noMcp ? ["--no-mcp"] : []),
 		...(parsed.noLsp ? ["--no-lsp"] : []),
 		...(parsed.noPty ? ["--no-pty"] : []),
 		...(parsed.noRules ? ["--no-rules"] : []),
@@ -1089,6 +1093,7 @@ async function buildSessionOptions(
 		cwd: parsed.cwd ?? getProjectDir(),
 	};
 	if (parsed.mcpConfig !== undefined) options.mcpConfigPath = parsed.mcpConfig;
+	if (parsed.noMcp === true) options.enableMcpAutoload = false;
 
 	const systemPromptSource = parsed.systemPrompt;
 	const resolvedSystemPrompt = await resolvePromptInput(systemPromptSource, "system prompt");
@@ -1221,7 +1226,9 @@ async function buildSessionOptions(
 		options.rules = [];
 	}
 
-	options.disableExtensionDiscovery = true;
+	// General extension modules stay preloaded/explicit, while the SDK performs
+	// bounded native/Claude/Codex hook discovery through the canonical adapter.
+	options.disableExtensionDiscovery = false;
 	options.additionalExtensionPaths = [];
 
 	return { options };
@@ -1494,7 +1501,8 @@ export async function runRootCommand(
 	const startupUpdate = new StartupUpdateOrchestrator(
 		startupUpdateRoute,
 		() => settingsInstance.get("startup.checkUpdate"),
-		deps.startupUpdate?.check ?? (() => checkForNewVersion(VERSION, settingsInstance.get("startup.updateChannel"))),
+		deps.startupUpdate?.check ??
+			(() => checkForNewVersion(VERSION, resolveMachineLocalUpdateChannel(settingsInstance))),
 	);
 	const isInteractive = disposition.isInteractive;
 	const mode = parsedArgs.mode || "text";
@@ -1681,11 +1689,19 @@ export async function runRootCommand(
 	deps.rlmPreset?.applyOptions(sessionOptions, settingsInstance);
 	const acpStartupOptions = mode === "acp" ? resolveAcpStartupOptions(parsedArgs, sessionOptions) : undefined;
 
-	// Handle CLI --api-key as runtime override (not persisted)
+	// Handle CLI credential selection and --api-key as runtime overrides (not persisted).
 	if (parsedArgs.apiKey && parsedArgs.credential) {
 		process.stderr.write(`${chalk.red("--api-key and --credential cannot be used together")}\n`);
 		process.exit(1);
 	}
+	if (parsedArgs.credential && parsedArgs.preferCredential) {
+		process.stderr.write(`${chalk.red("--credential and --prefer-credential cannot be used together")}\n`);
+		process.exit(1);
+	}
+	if (parsedArgs.apiKey && parsedArgs.preferCredential) {
+		process.stderr.write(`${chalk.red("--api-key and --prefer-credential cannot be used together")}\n`);
+		process.exit(1);
+	}
 
 	if (parsedArgs.credential) {
 		try {
@@ -1696,6 +1712,15 @@ export async function runRootCommand(
 			process.exit(1);
 		}
 	}
+	if (parsedArgs.preferCredential) {
+		try {
+			sessionOptions.preferredCredentialSelector = parseCliCredentialSelector(parsedArgs.preferCredential);
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			process.stderr.write(`${chalk.red(message)}\n`);
+			process.exit(1);
+		}
+	}
 	if (parsedArgs.apiKey) {
 		if (!sessionOptions.model && !sessionOptions.modelPattern) {
 			process.stderr.write(
@@ -1794,6 +1819,8 @@ export async function runRootCommand(
 			eventBus,
 		} = await createSession(sessionOptions, { skipPostCreateModelRefresh: hasRootStartupProfile });
 		applyCliRuntimeApiKeyOverride(authStorage, parsedArgs.apiKey, session.model);
+		// Herdr integration: report gjc lifecycle state when running in a Herdr pane.
+		installHerdrReporter(listener => session.subscribe(listener));
 
 		// Research-mode (RLM) preset: hard tool-boundary assertion after the registry is assembled.
 		if (deps.rlmPreset?.onSessionCreated) {

package/src/migrate/mcp-mapper.ts

@@ -38,7 +38,18 @@ const SECRET_INDIRECTION_FIELDS: Record<MigrateSource, string[]> = {
 
 /** Fields recognized for a source (handled or intentionally omitted). Anything else is omitted-with-warning. */
 const RECOGNIZED_FIELDS: Record<MigrateSource, ReadonlySet<string>> = {
-	"claude-code": new Set(["type", "command", "args", "env", "url", "headers", "enabled", "timeout", "cwd"]),
+	"claude-code": new Set([
+		"type",
+		"command",
+		"args",
+		"env",
+		"url",
+		"headers",
+		"enabled",
+		"timeout",
+		"cwd",
+		"protocol",
+	]),
 	codex: new Set([
 		"type",
 		"command",
@@ -50,6 +61,7 @@ const RECOGNIZED_FIELDS: Record<MigrateSource, ReadonlySet<string>> = {
 		"enabled",
 		"timeout",
 		"tool_timeout_sec",
+		"protocol",
 		// omitted-with-warning fields are still "recognized" (handled below):
 		"env_vars",
 		"env_http_headers",
@@ -58,7 +70,7 @@ const RECOGNIZED_FIELDS: Record<MigrateSource, ReadonlySet<string>> = {
 		"enabled_tools",
 		"disabled_tools",
 	]),
-	opencode: new Set(["type", "command", "args", "env", "url", "headers", "enabled", "timeout", "cwd"]),
+	opencode: new Set(["type", "command", "args", "env", "url", "headers", "enabled", "timeout", "cwd", "protocol"]),
 };
 
 /** Fields with no GJC equivalent: omitted-with-warning (named explicitly so the warning is precise). */
@@ -92,6 +104,16 @@ export function mapMcpEntry(source: MigrateSource, name: string, raw: unknown):
 	const url = typeof raw.url === "string" ? raw.url : undefined;
 
 	const base: { enabled?: boolean; timeout?: number } = {};
+	// Preserve only a representable protocol preference (http/sse only); anything
+	// else falls back to the safe-negotiation default (`auto`) with a warning.
+	let protocol: "auto" | "2026-07-28" | "legacy" | undefined;
+	if (raw.protocol !== undefined) {
+		if (raw.protocol === "auto" || raw.protocol === "2026-07-28" || raw.protocol === "legacy") {
+			protocol = raw.protocol;
+		} else {
+			warnings.push(`omitted unsupported protocol value for "${name}" (defaulting to safe negotiation)`);
+		}
+	}
 	if (typeof raw.enabled === "boolean") base.enabled = raw.enabled;
 	if (typeof raw.timeout === "number") base.timeout = raw.timeout;
 	// Codex tool_timeout_sec -> timeout (ms).
@@ -145,6 +167,7 @@ export function mapMcpEntry(source: MigrateSource, name: string, raw: unknown):
 		const type = rawType === "sse" ? "sse" : "http";
 		const config = { type, url, ...base } as MCPServerConfig;
 		if (headers) (config as { headers?: Record<string, string> }).headers = headers;
+		if (protocol) (config as { protocol?: "auto" | "2026-07-28" | "legacy" }).protocol = protocol;
 		return { ok: true, config, warnings };
 	}
 

package/src/modes/acp/abort-scope.ts

@@ -0,0 +1,29 @@
+import type { AbortScope } from "../../sdk/host/control/operations";
+
+const ACP_ABORT_SCOPE_ENV = "GJC_ACP_ABORT_SCOPE";
+
+function parseAcpAbortScope(value: unknown): AbortScope {
+	if (value === "turn" || value === "owned") return value;
+	return "turn";
+}
+
+/**
+ * Resolves the C04 terminal-abort scope for an ACP `session/cancel`. Client
+ * metadata is authoritative; the process environment is only a fallback when
+ * that field is absent. Both default to `"turn"` so an external client that
+ * ends a turn only stops that turn, matching the SDK `turn.abort` default and
+ * other ACP clients' cancel behavior; a client that also wants exact owned
+ * subagents and background tasks stopped opts in per request with
+ * `_meta.gjc.abortScope: "owned"` (or process-wide with
+ * `GJC_ACP_ABORT_SCOPE=owned`). Paseo keeps owned cancels through its provider
+ * config `env: { "GJC_ACP_ABORT_SCOPE": "owned" }` without source changes.
+ */
+export function resolveAcpAbortScope(meta: unknown, env: NodeJS.ProcessEnv = process.env): AbortScope {
+	if (typeof meta === "object" && meta !== null) {
+		const gjc = (meta as { gjc?: unknown }).gjc;
+		if (typeof gjc === "object" && gjc !== null && "abortScope" in gjc) {
+			return parseAcpAbortScope((gjc as { abortScope?: unknown }).abortScope);
+		}
+	}
+	return parseAcpAbortScope(env[ACP_ABORT_SCOPE_ENV]);
+}