@gajae-code/coding-agent 0.18.7 → 0.18.8

package/src/capability/index.ts

@@ -22,6 +22,7 @@ import {
 } from "@gajae-code/utils";
 
 import type { Settings } from "../config/settings";
+import { resolveGlobalUserSkillLinkTrust } from "../config/skill-settings-defaults";
 import { clearCache as clearFsCache, findRepoRoot, cacheStats as fsCacheStats, invalidate as invalidateFs } from "./fs";
 import type {
 	Capability,
@@ -413,6 +414,8 @@ export async function loadCapability<T>(capabilityId: string, options: LoadOptio
 	const ordinaryOptions: LoadOptions = options.isolatedHome ? { ...options, isolatedHome: false } : options;
 	const cwd = ordinaryOptions.cwd ?? getProjectDir();
 	const home = getTrustedHomeDir();
+	const activeSettings = ordinaryOptions.settings ?? settingsByCwd.get(path.normalize(cwd));
+	const globalSettings = typeof activeSettings?.getGlobal === "function" ? activeSettings : undefined;
 	const userAgentDir = ordinaryOptions.agentDir ? path.resolve(ordinaryOptions.agentDir) : getAgentDir();
 	const profileAuthority =
 		ordinaryOptions.profileAuthority ??
@@ -429,6 +432,10 @@ export async function loadCapability<T>(capabilityId: string, options: LoadOptio
 		repoRoot,
 		isolatedHome: false,
 		settings: ordinaryOptions.settings,
+		allowExternalUserSkillSymlinks: resolveGlobalUserSkillLinkTrust({
+			trustUserSkills: globalSettings?.getGlobal("skills.trustUserSkills"),
+			enablePiUser: globalSettings?.getGlobal("skills.enablePiUser"),
+		}),
 		bypassCache: ordinaryOptions.bypassCache,
 	};
 	const providers = filterProviders(capability, ordinaryOptions);
@@ -521,6 +528,16 @@ export async function loadCapabilityForHome<T>(
 		isolatedHome,
 		homeIdentity,
 		settings: isolatedOptions.settings,
+		allowExternalUserSkillSymlinks: resolveGlobalUserSkillLinkTrust({
+			trustUserSkills:
+				typeof isolatedOptions.settings?.getGlobal === "function"
+					? isolatedOptions.settings.getGlobal("skills.trustUserSkills")
+					: undefined,
+			enablePiUser:
+				typeof isolatedOptions.settings?.getGlobal === "function"
+					? isolatedOptions.settings.getGlobal("skills.enablePiUser")
+					: undefined,
+		}),
 	};
 
 	return await loadImpl(capability, providers, ctx, isolatedOptions);

package/src/capability/mcp.ts

@@ -41,6 +41,8 @@ export interface MCPServer {
 	url?: string;
 	/** HTTP headers (for HTTP transport) */
 	headers?: Record<string, string>;
+	/** Persisted public-network requirement for an HTTP MCP endpoint. */
+	publicNetwork?: boolean;
 	/** Authentication configuration */
 	auth?: {
 		type: "oauth" | "apikey";

package/src/capability/skill.ts

@@ -41,6 +41,8 @@ export interface Skill {
 	name: string;
 	/** Absolute path to skill file */
 	path: string;
+	/** Lexical path used to discover the file, preserving symlink provenance for management operations. */
+	discoveryPath?: string;
 	/** Skill content (markdown) */
 	/** Lazily load the markdown body when the caller needs prompt content. */
 	loadContent?: () => Promise<string>;

package/src/capability/types.ts

@@ -44,6 +44,8 @@ export interface LoadContext {
 	bypassCache?: boolean;
 	/** Owning session settings for provider policy decisions. */
 	settings?: Settings;
+	/** User-owned permission to follow skill links outside a user scan root. */
+	allowExternalUserSkillSymlinks?: boolean;
 }
 
 /**

package/src/cli/auth-broker-cli.ts

@@ -467,7 +467,7 @@ async function runImport(flags: AuthBrokerCommandArgs["flags"]): Promise<void> {
 	if (!target) {
 		throw new Error("Usage: gjc auth-broker import <file|dir> [--provider=<id>] [--include-disabled] [--dry-run]");
 	}
-	const resolvedTarget = path.resolve(target.startsWith("~") ? target.replace(/^~/, os.homedir()) : target);
+	const resolvedTarget = path.resolve(target.startsWith("~") ? target.replace(/^~/, () => os.homedir()) : target);
 	const { entries, skipped } = await loadImportPlan(resolvedTarget, flags.provider, flags.includeDisabled === true);
 
 	if (flags.json) {

package/src/cli/customize-doctor.ts

@@ -32,7 +32,7 @@ import { type SlashCommand, slashCommandCapability } from "../capability/slash-c
 import { type CustomTool, toolCapability } from "../capability/tool";
 import type { Capability, LoadContext, LoadResult, SourceMeta } from "../capability/types";
 import { Settings, type Settings as SettingsInstance } from "../config/settings";
-import { resolveSkillScopeTrust } from "../config/skill-settings-defaults";
+import { resolveGlobalUserSkillLinkTrust, resolveSkillScopeTrust } from "../config/skill-settings-defaults";
 import { getEmbeddedDefaultGjcSkills } from "../defaults/gjc-defaults";
 import { initializeWithSettings, loadCapability } from "../discovery";
 import { inspectClaudeConvention } from "../discovery/claude";
@@ -683,6 +683,10 @@ async function collectSkills(cwd: string, activeSettings: SettingsInstance): Pro
 			...activeSettings.getGroup("skills"),
 			cwd,
 			disabledExtensions: activeSettings.get("disabledExtensions"),
+			allowExternalUserSkillSymlinks: resolveGlobalUserSkillLinkTrust({
+				trustUserSkills: activeSettings.getGlobal("skills.trustUserSkills"),
+				enablePiUser: activeSettings.getGlobal("skills.enablePiUser"),
+			}),
 		});
 		for (const skill of result.skills) loadedNames.add(getSkillFilesystemIdentity(skill.name));
 	}
@@ -798,7 +802,16 @@ async function collectSkills(cwd: string, activeSettings: SettingsInstance): Pro
 	for (const dir of [...customDirs].sort()) {
 		const scan = await scanSkillsFromDir(
 			{ cwd, home: os.homedir(), repoRoot: null },
-			{ dir: expandTilde(dir), providerId: "custom", level: "user", requireDescription: true },
+			{
+				dir: expandTilde(dir),
+				providerId: "custom",
+				level: "user",
+				requireDescription: true,
+				allowExternalUserSkillSymlinks: resolveGlobalUserSkillLinkTrust({
+					trustUserSkills: activeSettings.getGlobal("skills.trustUserSkills"),
+					enablePiUser: activeSettings.getGlobal("skills.enablePiUser"),
+				}),
+			},
 		);
 		for (const skill of scan.items) {
 			const base: Omit<CustomizeDoctorItem, "status" | "reason" | "detail" | "remediation"> = {

package/src/cli/public-command-errors.ts

@@ -20,6 +20,7 @@ export type PublicFailureKind =
 	| "timeout"
 	| "wait_timeout"
 	| "uncertain_after_send"
+	| "busy"
 	| "daemon_unhealthy"
 	| "daemon_stale"
 	| "daemon_mixed"
@@ -100,6 +101,10 @@ export const PUBLIC_COMMAND_DIAGNOSTICS = {
 		"The macOS open-file limit is below the recommended minimum; increase it before starting additional concurrent work.",
 	sdk_resource_gone:
 		"The requested resource is not available from this session endpoint; this reports absent resource state, not an empty result.",
+	sdk_unknown_operation:
+		"The --op value is not a known SDK operation id for this command. Per-session control ids include turn.prompt, turn.steer, turn.follow_up, turn.abort and turn.abort_and_prompt.",
+	sdk_scope_requires_repository:
+		"The selected session-list scope requires a Git repository. Run inside a checkout, pass --repo <path>, or use --scope cwd or --scope all.",
 	router_cleanup_failed: "SDK session Router cleanup failed.",
 	broker_cleanup_failed: "SDK broker client cleanup failed.",
 	// The broker reports this code from several distinct causes, so the text names none
@@ -162,6 +167,7 @@ const messages: Record<PublicFailureKind, string> = {
 	timeout: "The operation timed out; its outcome requires reconciliation.",
 	wait_timeout: "Waiting timed out after the operation was accepted. Do not replay it.",
 	uncertain_after_send: "The request was sent but its outcome is uncertain. Reconcile before any replay.",
+	busy: "The session is running a turn and refused the request.",
 	daemon_unhealthy: "The selected daemon is unhealthy.",
 	daemon_stale: "The selected daemon has stale runtime state.",
 	daemon_mixed: "Some daemon targets failed. Do not repeat mutations that already succeeded.",
@@ -282,6 +288,9 @@ export function classifyPublicCommandFailure(
 	else if (kind === "uncertain_after_send") {
 		category = "uncertain";
 		outcomeCertainty = "unknown";
+	} else if (kind === "busy") {
+		category = "unavailable";
+		if (outcomeCertainty === "not-applied") retryability = "yes";
 	} else if (
 		[
 			"unavailable",
@@ -325,7 +334,18 @@ export function classifyPublicCommandFailure(
 			nextSteps.push(step("Wait for the existing restart to finish, then inspect status; do not restart again."));
 		const session = references.find(ref => ref.kind === "sessionId");
 		const operation = references.find(ref => ref.kind === "operationRef");
-		if (
+		if (kind === "busy" && canonical[0] === "sdk" && outcomeCertainty === "not-applied") {
+			// A refused-before-execution request has no operation record to reconcile:
+			// point at the busy turn instead of a status lookup that can only say unknown.
+			nextSteps.push(
+				step(
+					"Steer the active turn with `sdk session raw control <sessionId> --op turn.steer`, or wait until the session is idle before sending again.",
+					session && executableValue(session.value)
+						? ["sdk", "session", "inspect", session.value]
+						: ["sdk", "session", "list"],
+				),
+			);
+		} else if (
 			canonical[0] === "sdk" &&
 			session &&
 			operation &&

package/src/cli/setup-cli.ts

@@ -766,7 +766,7 @@ async function confirmImport(count: number): Promise<boolean> {
 }
 
 /**
- * Discover existing Claude Code / Codex CLI credentials and import them into the
+ * Discover existing Claude Code / Codex CLI / Kiro CLI credentials and import them into the
  * gjc credential store after a redacted preview + confirmation. Falls back to
  * manual-setup guidance when nothing importable is found.
  */
@@ -834,7 +834,7 @@ export async function handleCredentialsSetup(
 			for (const line of formatDiscoverySummary(filteredResult)) process.stdout.write(`  ${line}\n`);
 			process.stdout.write(
 				chalk.yellow(
-					`\nNo importable Claude/Codex credentials found. Continue with manual setup:\n` +
+					`\nNo importable Claude/Codex/Kiro CLI credentials found. Continue with manual setup:\n` +
 						`  ${APP_NAME} setup provider   (add an API-compatible provider)\n` +
 						`  ${APP_NAME} (then /login)     (interactive OAuth/subscription login)\n`,
 				),
@@ -930,7 +930,7 @@ ${chalk.bold("Components:")}
   provider  Optional: add a preset, OpenAI-compatible, or Anthropic-compatible API provider
   python    Optional: verify a Python 3 interpreter is reachable for code execution
   stt       Optional: install speech-to-text dependencies (openai-whisper, recording tools)
-  credentials Optional: import existing Claude Code / Codex CLI credentials
+  credentials Optional: import existing Claude Code / Codex CLI / Kiro CLI credentials
 
 
 ${chalk.bold("Provider example:")}
@@ -998,7 +998,7 @@ ${chalk.bold("Examples:")}
   ${APP_NAME} setup stt              Install speech-to-text dependencies
   ${APP_NAME} setup stt --check      Check if STT dependencies are available
   ${APP_NAME} setup python --check   Check if Python execution is available
-  ${APP_NAME} setup credentials      Discover & import existing Claude/Codex credentials
+  ${APP_NAME} setup credentials      Discover & import existing Claude/Codex/Kiro CLI credentials
   ${APP_NAME} setup credentials --dry-run  Preview importable credentials (redacted)
   ${APP_NAME} setup credentials --yes      Import without an interactive prompt
   ${APP_NAME} setup paseo            Register GJC as a Paseo ACP provider

package/src/cli/skills-cli.ts

@@ -3,6 +3,7 @@
  * filesystem-discovered custom skills.
  */
 import { Settings } from "../config/settings";
+import { resolveGlobalUserSkillLinkTrust } from "../config/skill-settings-defaults";
 import {
 	DEFAULT_GJC_DEFINITION_NAMES,
 	type EmbeddedDefaultGjcSkill,
@@ -111,6 +112,10 @@ export async function runSkillsCommand(cmd: SkillsCommandArgs): Promise<void> {
 					...settings.getGroup("skills"),
 					disabledExtensions: settings.get("disabledExtensions"),
 				},
+				allowExternalUserSkillSymlinks: resolveGlobalUserSkillLinkTrust({
+					trustUserSkills: settings.getGlobal("skills.trustUserSkills"),
+					enablePiUser: settings.getGlobal("skills.enablePiUser"),
+				}),
 			});
 			if (cmd.flags?.json) {
 				writeJson({

package/src/commands/deep-interview.ts

@@ -7,37 +7,71 @@ export default class DeepInterview extends Command {
 
 All deep-interview state operations go through this command — no gjc state needed:
   read                Print the persisted envelope, revision, content sha, and any pending draft
-  write               One-shot incremental JSON merge into state (--reset replaces; the locked
-                      intent contract survives a reset)
-  stage               Stage one JSON transition draft (--for <transition> --input '<json>'|@file)
+  write               One-shot incremental JSON merge into state; required --input '<json>'|@file
+                      must use the {"state":{...}} shape (--reset replaces; the locked intent
+                      contract survives a reset)
+  kickoff             Seed an interviewing session; --trace and --json are supported alongside
+                      --quick|--standard|--deep
+  write-spec          Persist a final spec through --write; --force only overwrites corrupt state
+  stage               Stage one JSON transition draft; required --for <transition> and --input
+                      '<json>'|@file use the {"state":{...}} shape
   check               Dry-run the staged draft against current state (same merge apply performs)
   apply               Commit the staged draft with runtime-owned revision+sha CAS
   discard             Remove the pending draft
   clear               Clear deep-interview state for the session (lifecycle passthrough)
+  approve-execution   Record the user's separate, explicit approval for a ready canonical Crystal
   handoff             Hand off to the next workflow skill (lifecycle passthrough)
+  --crystallize       Promote a bounded authenticated conversation snapshot into a versioned
+                      Crystal; required --input '<crystallize JSON>'|@file and --slug <slug>
+
+Crystallize input must be a JSON object with these required fields (optional prior, removed_ids,
+resolved_open_gaps, resolved_conflicts, and their anchors may extend the object):
+  {"snapshot":{"revision":N,"start":N,"end":N,"digest":"<sha256>","messages":[...]},
+   "current_revision":N,"items":[{"id":"...","kind":"goal|constraint|decision|acceptance_criterion|non_goal",
+   "classification":"confirmed|inferred|disputed","statement":"...","anchor":{"message_index":N,"quote":"..."}}],
+   "open_gaps":[],"conflicts":[]}
+Confirmed items require a verbatim user anchor; inferred/disputed items must not be treated as
+confirmed. The raw --input payload is bounded to 1 MiB; items are capped at 128 and each text
+field at 10,000 characters, and snapshot messages must be contiguous, ordered, and cover
+start..end (maximum 200 messages). The
+digest/current_revision must match the live authenticated transcript. A ready Crystal persists as
+deep-interview-<slug>-v<spec_version>.md;
+needs-questions, stale, or superseded Crystal input does not publish a spec. Crystallize always
+leaves execution_approval as not-approved; approve-execution is a separate explicit transition.
 
 Ambiguity is runtime-owned: apply/write derive current_ambiguity from the latest valid scored
 round and clamp it to the deterministic floor. Sessions resolve from --session-id, payload
-session_id, or GJC_SESSION_ID.`;
+session_id, or GJC_SESSION_ID. A relative GJC_SESSION_FILE is resolved against the requested
+workspace cwd, never the process launch directory.`;
 	static strict = false;
 	static flags = {
 		quick: Flags.boolean({ description: "Seed a quick deep-interview run" }),
 		standard: Flags.boolean({ description: "Seed a standard deep-interview run" }),
 		deep: Flags.boolean({ description: "Seed a deep deep-interview run" }),
+		crystallize: Flags.boolean({ description: "Crystallize a bounded conversation snapshot into a versioned spec" }),
 		trace: Flags.boolean({ description: "Run a bounded trace evidence pre-step before interview questions" }),
 		threshold: Flags.string({ description: "Override ambiguity threshold for kickoff" }),
 		"threshold-source": Flags.string({ description: "Describe the threshold override source" }),
 		"session-id": Flags.string({
 			description: "Route state/spec handoff through a session-scoped .gjc/_session-{sessionid} directory",
 		}),
-		input: Flags.string({ description: "JSON payload (or @file) for the write/stage verbs" }),
+		input: Flags.string({
+			description:
+				'Required JSON object (or @file): generic api uses --input; write/stage use {"state":{...}}; crystallize uses snapshot/current_revision/items; payload <=1 MiB',
+		}),
 		for: Flags.string({
 			description: "Transition for stage: initialize-context | record-round | update-facts | merge-state",
 		}),
 		reset: Flags.boolean({ description: "With write: replace state instead of incremental merge" }),
-		write: Flags.boolean({ description: "Persist a final deep-interview spec through the sanctioned GJC CLI/API" }),
+		write: Flags.boolean({
+			description:
+				"Persist a final deep-interview spec through the sanctioned GJC CLI/API (requires --spec; positional write requires --input)",
+		}),
 		stage: Flags.string({ description: 'Spec stage for --write (currently "final")' }),
-		slug: Flags.string({ description: "Safe slug for .gjc/_session-{sessionid}/specs/deep-interview-<slug>.md" }),
+		slug: Flags.string({
+			description:
+				"Required with --crystallize; safe slug for .gjc/_session-{sessionid}/specs/deep-interview-<slug>.md",
+		}),
 		spec: Flags.string({ description: "Final spec markdown or a path to the final spec markdown" }),
 		handoff: Flags.string({ description: 'After --write, hand off to a workflow target (currently "ralplan")' }),
 		deliberate: Flags.boolean({
@@ -48,13 +82,18 @@ session_id, or GJC_SESSION_ID.`;
 	};
 	static examples = [
 		'$ gjc deep-interview --trace --standard "<idea>"',
+		'$ gjc deep-interview --trace --standard "<idea>" --json',
 		"$ gjc deep-interview read --json",
-		'$ gjc deep-interview write --input \'{"state":{"threshold":0.05}}\' --json',
+		'$ gjc deep-interview write --input \'{"state":{"threshold":0.05,"threshold_source":"default"}}\' --json',
 		'$ gjc deep-interview stage --for record-round --input \'{"state":{"rounds":[{"round":1,"round_key":"r1"}]}}\' --json',
 		"$ gjc deep-interview check --json",
 		"$ gjc deep-interview apply --json",
+		"$ gjc deep-interview approve-execution --json",
 		"$ gjc deep-interview --write --stage final --slug my-feature --spec ./final-spec.md",
+		"$ gjc deep-interview --write --stage final --slug my-feature --spec ./final-spec.md --force",
 		"$ gjc deep-interview --write --stage final --slug my-feature --spec ./final-spec.md --deliberate",
+		'$ gjc deep-interview --crystallize --input \'{"snapshot":{"revision":1,"start":0,"end":0,"digest":"<64-hex-sha256>","messages":[{"index":0,"role":"user","content":"Build audit reports"}]},"current_revision":1,"items":[{"id":"goal:reports","kind":"goal","classification":"confirmed","statement":"Build audit reports","anchor":{"message_index":0,"quote":"Build audit reports"}}],"open_gaps":[],"conflicts":[]}\' --slug audit-reports --json',
+		"$ gjc deep-interview --crystallize --input @conversation.json --slug my-feature --json",
 	];
 
 	async run(): Promise<void> {

package/src/commands/sdk.ts

@@ -15,6 +15,7 @@ import { CliParseError, Command } from "@gajae-code/utils/cli";
 import type { Args as ParsedArgs } from "../cli/args";
 import { isSafeSdkInternalAgentDir, scanPublicCommand } from "../cli/public-command-entry";
 import { PublicCommandFailure } from "../cli/public-command-errors";
+import { FileLockAcquireError } from "../config/file-lock";
 import { parseModelString } from "../config/model-resolver";
 import { Settings } from "../config/settings";
 import { usePostmortemSignalExitAuthority } from "../lsp/client";
@@ -31,6 +32,7 @@ import {
 import { readBrokerDiscovery } from "../sdk/broker/discovery";
 import { type EndpointFileRead, readEndpointFile } from "../sdk/broker/endpoint-authority";
 import {
+	BROKER_DISCOVERY_BUDGET,
 	emitBrokerStartupTestSignal,
 	reconcileBrokerGenerationForStartup,
 	withBrokerStartupLock,
@@ -1760,7 +1762,7 @@ export default class Sdk extends Command {
 		let runningBroker: Broker | undefined;
 		let stopSweep: (() => void) | undefined;
 		let startupExitRequested = false;
-		let startupExitReason: "startup-deadline" | "startup-signal" | undefined;
+		let startupExitReason: BrokerStartupExitRecord["reason"] | undefined;
 		let startupExitLogged = false;
 		let pendingShutdownSignal: "SIGTERM" | "SIGINT" | undefined;
 		let startupExitTask: Promise<boolean> | undefined;
@@ -1781,10 +1783,11 @@ export default class Sdk extends Command {
 		};
 		const startupSignalExitCode = (signal: "SIGTERM" | "SIGINT"): 130 | 143 => (signal === "SIGINT" ? 130 : 143);
 		const makeStartupExitRecord = (
-			reason: "startup-deadline" | "startup-signal",
+			reason: BrokerStartupExitRecord["reason"],
 			exitCode: 1 | 130 | 143,
 			signal: "SIGTERM" | "SIGINT" | null,
 			timeoutMs?: number,
+			blockingLockPath?: string,
 		): BrokerStartupExitRecord & Record<string, unknown> => ({
 			version: 1,
 			reason,
@@ -1797,6 +1800,7 @@ export default class Sdk extends Command {
 			exitCode,
 			timeoutMs: timeoutMs ?? null,
 			writtenAt: Date.now(),
+			...(blockingLockPath === undefined ? {} : { blockingLockPath }),
 		});
 		const beginStartupExitRecordWrite = (record: BrokerStartupExitRecord): Promise<BrokerStartupExitWriteStatus> => {
 			const testDelayMs = Number(process.env.GJC_SDK_TEST_BROKER_STARTUP_EXIT_RECORD_DELAY_MS ?? 0);
@@ -1831,21 +1835,24 @@ export default class Sdk extends Command {
 			process.stderr.write(`${JSON.stringify({ level, message, ...record })}\n`);
 		};
 		const exitDuringStartup = (
-			reason: "startup-deadline" | "startup-signal",
+			reason: BrokerStartupExitRecord["reason"],
 			exitCode: 1 | 130 | 143,
 			signal: "SIGTERM" | "SIGINT" | null,
 			timeoutMs?: number,
+			blockingLockPath?: string,
 		): Promise<boolean> => {
 			// The first startup exit cause owns both the persisted reason and the process exit code.
 			if (startupExitTask) return startupExitReason === reason ? startupExitTask : Promise.resolve(false);
 			if (startupExitRequested) return Promise.resolve(false);
 			startupExitRequested = true;
 			startupExitReason = reason;
-			const exitRecord = makeStartupExitRecord(reason, exitCode, signal, timeoutMs);
+			const exitRecord = makeStartupExitRecord(reason, exitCode, signal, timeoutMs, blockingLockPath);
 			const message =
-				reason === "startup-deadline"
-					? `SDK broker startup exceeded its ${timeoutMs}ms fence deadline.`
-					: `SDK broker startup interrupted by ${signal} before readiness.`;
+				reason === "startup-lock-blocked" && blockingLockPath
+					? `SDK broker startup blocked by retained removal transition ${blockingLockPath}.`
+					: reason === "startup-deadline"
+						? `SDK broker startup exceeded its ${timeoutMs}ms fence deadline.`
+						: `SDK broker startup interrupted by ${signal} before readiness.`;
 			writeStartupExitLog(exitRecord, message);
 			startupExitTask = (async () => {
 				const exitRecordWrite = await beginStartupExitRecordWrite(exitRecord);
@@ -1874,7 +1881,7 @@ export default class Sdk extends Command {
 						: pendingShutdownSignal;
 			if (!signal) return;
 			pendingShutdownSignal = signal;
-			if (startupExitTask && startupExitReason === "startup-deadline") {
+			if (startupExitTask && startupExitReason !== "startup-signal") {
 				await startupExitTask;
 				await waitForStartupAbortCleanup();
 				process.exit(1);
@@ -1907,6 +1914,7 @@ export default class Sdk extends Command {
 					Number.isSafeInteger(testWatchdogMs) && testWatchdogMs > 0 && testWatchdogMs <= remainingMs
 						? testWatchdogMs
 						: remainingMs;
+				const startupCheckpointDeadline = performance.now() + watchdogMs - 1_000;
 				const startupWatchdog = setTimeout(() => {
 					startupAbortController.abort();
 					void exitDuringStartup("startup-deadline", 1, null, watchdogMs).then(async started => {
@@ -2004,6 +2012,7 @@ export default class Sdk extends Command {
 					const candidate = new Broker({
 						agentDir,
 						startupAbortSignal: startupAbortController.signal,
+						startupCheckpointDeadline,
 						onStartupReady: () => clearTimeout(startupWatchdog),
 						masterOrphanGraceMs: (await Settings.loadForScope({ cwd: process.cwd(), agentDir })).get(
 							"sdk.masterOrphanGraceMs",
@@ -2047,6 +2056,17 @@ export default class Sdk extends Command {
 				await finishPendingStartupSignal();
 				return;
 			}
+			// A retained removal transition is an explicit acquire failure, not only
+			// an exhausted ordinary contention timeout.
+			if (error instanceof FileLockAcquireError && error.orphanPath) {
+				await exitDuringStartup(
+					"startup-lock-blocked",
+					1,
+					null,
+					BROKER_DISCOVERY_BUDGET.startupLockWaitMs,
+					error.orphanPath,
+				);
+			}
 			if (broker) {
 				try {
 					await broker.stop({ kind: "startup-failure" });

package/src/config/autorouting-tier-map.ts

@@ -77,16 +77,9 @@ export const CURATED_TIER_LABELS = {
 
 /** Generated from packages/ai/src/models.json at feature land: 3936 in-scope baseline skips. */
 export const TIER_MAP_SKIP_LIST = {
-	"amazon-bedrock/anthropic.claude-sonnet-5-5": { rationale: "Sonnet 5.5 catalog addition (#6111); not yet curated" },
 	"amazon-bedrock/au.anthropic.claude-sonnet-5-5": {
 		rationale: "Sonnet 5.5 catalog addition (#6111); not yet curated",
 	},
-	"amazon-bedrock/eu.anthropic.claude-sonnet-5-5": {
-		rationale: "Sonnet 5.5 catalog addition (#6111); not yet curated",
-	},
-	"amazon-bedrock/global.anthropic.claude-sonnet-5-5": {
-		rationale: "Sonnet 5.5 catalog addition (#6111); not yet curated",
-	},
 	"amazon-bedrock/jp.anthropic.claude-sonnet-5-5": {
 		rationale: "Sonnet 5.5 catalog addition (#6111); not yet curated",
 	},
@@ -6498,6 +6491,123 @@ export const TIER_MAP_SKIP_LIST = {
 	"kiro/minimax-m2.1": { rationale: "Kiro API-key catalog addition; not yet curated" },
 	"kiro/minimax-m2.5": { rationale: "Kiro API-key catalog addition; not yet curated" },
 	"kiro/qwen3-coder-next": { rationale: "Kiro API-key catalog addition; not yet curated" },
+	// Models.dev refresh additions
+	"amazon-bedrock/anthropic.claude-sonnet-5-5": { rationale: "models.dev refresh addition; not yet curated" },
+	"amazon-bedrock/eu.anthropic.claude-sonnet-5-5": { rationale: "models.dev refresh addition; not yet curated" },
+	"amazon-bedrock/global.anthropic.claude-sonnet-5-5": { rationale: "models.dev refresh addition; not yet curated" },
+	"amazon-bedrock/global.moonshotai.kimi-k3": { rationale: "models.dev refresh addition; not yet curated" },
+	"amazon-bedrock/global.openai.gpt-6-luna": { rationale: "models.dev refresh addition; not yet curated" },
+	"amazon-bedrock/global.openai.gpt-6-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"amazon-bedrock/global.openai.gpt-6.1-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"amazon-bedrock/global.xai.grok-4.7": { rationale: "models.dev refresh addition; not yet curated" },
+	"amazon-bedrock/openai.gpt-6-luna": { rationale: "models.dev refresh addition; not yet curated" },
+	"amazon-bedrock/openai.gpt-6-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"amazon-bedrock/openai.gpt-6.1-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"amazon-bedrock/us.moonshotai.kimi-k3": { rationale: "models.dev refresh addition; not yet curated" },
+	"amazon-bedrock/us.openai.gpt-6-luna": { rationale: "models.dev refresh addition; not yet curated" },
+	"amazon-bedrock/us.openai.gpt-6-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"amazon-bedrock/us.openai.gpt-6.1-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"amazon-bedrock/us.xai.grok-4.7": { rationale: "models.dev refresh addition; not yet curated" },
+	"cloudflare-ai-gateway/anthropic/claude-opus-5.5": { rationale: "models.dev refresh addition; not yet curated" },
+	"cloudflare-ai-gateway/openai/gpt-6-luna": { rationale: "models.dev refresh addition; not yet curated" },
+	"cloudflare-ai-gateway/openai/gpt-6-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"cloudflare-ai-gateway/xai/grok-4.7": { rationale: "models.dev refresh addition; not yet curated" },
+	"deepinfra/XiaomiMiMo/MiMo-V2.6-Flash": { rationale: "models.dev refresh addition; not yet curated" },
+	"deepinfra/XiaomiMiMo/MiMo-V2.6-Pro": { rationale: "models.dev refresh addition; not yet curated" },
+	"deepinfra/tencent/Hy4-preview": { rationale: "models.dev refresh addition; not yet curated" },
+	"github-copilot/claude-opus-5.5": { rationale: "models.dev refresh addition; not yet curated" },
+	"github-copilot/claude-sonnet-5.5": { rationale: "models.dev refresh addition; not yet curated" },
+	"github-copilot/gpt-6-luna": { rationale: "models.dev refresh addition; not yet curated" },
+	"github-copilot/gpt-6-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"github-copilot/gpt-6.1-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"kilo/aion-labs/aion-3.5": { rationale: "models.dev refresh addition; not yet curated" },
+	"kilo/aion-labs/aion-3.5-mini": { rationale: "models.dev refresh addition; not yet curated" },
+	"kilo/anthropic/claude-sonnet-5.5": { rationale: "models.dev refresh addition; not yet curated" },
+	"kilo/cohere/command-a-plus": { rationale: "models.dev refresh addition; not yet curated" },
+	"kilo/fireworks/ember-1": { rationale: "models.dev refresh addition; not yet curated" },
+	"kilo/openai/gpt-6-luna": { rationale: "models.dev refresh addition; not yet curated" },
+	"kilo/openai/gpt-6-luna-pro": { rationale: "models.dev refresh addition; not yet curated" },
+	"kilo/openai/gpt-6-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"kilo/openai/gpt-6-sol-pro": { rationale: "models.dev refresh addition; not yet curated" },
+	"kilo/openai/gpt-6.1-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"kilo/openai/gpt-6.1-sol-pro": { rationale: "models.dev refresh addition; not yet curated" },
+	"kilo/perceptron/perceptron-mk1.5": { rationale: "models.dev refresh addition; not yet curated" },
+	"kilo/qwen/qwen3.8-max-prime": { rationale: "models.dev refresh addition; not yet curated" },
+	"kilo/qwen/qwen3.8-omni-flash": { rationale: "models.dev refresh addition; not yet curated" },
+	"kilo/stealth/space-bunny-alpha": { rationale: "models.dev refresh addition; not yet curated" },
+	"kilo/typesafe/jev-router": { rationale: "models.dev refresh addition; not yet curated" },
+	"kilo/upstage/solar-mini4": { rationale: "models.dev refresh addition; not yet curated" },
+	"kilo/z-ai/glm-5.3-prime": { rationale: "models.dev refresh addition; not yet curated" },
+	"minimax-code-cn/MiniMax-M3.1-Flash-Preview": { rationale: "models.dev refresh addition; not yet curated" },
+	"minimax-code/MiniMax-M3.1-Flash-Preview": { rationale: "models.dev refresh addition; not yet curated" },
+	"openai/gpt-6-luna": { rationale: "models.dev refresh addition; not yet curated" },
+	"openai/gpt-6-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"openai/gpt-6.1-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"openai/gpt-daybreak-blue-latest": { rationale: "models.dev refresh addition; not yet curated" },
+	"openai/gpt-daybreak-red-latest": { rationale: "models.dev refresh addition; not yet curated" },
+	"opencode-go/gpt-6-luna": { rationale: "models.dev refresh addition; not yet curated" },
+	"opencode-go/longcat-2.5-preview-free": { rationale: "models.dev refresh addition; not yet curated" },
+	"opencode-go/space-bunny-free": { rationale: "models.dev refresh addition; not yet curated" },
+	"opencode-zen/claude-opus-5-5": { rationale: "models.dev refresh addition; not yet curated" },
+	"opencode-zen/claude-sonnet-5-5": { rationale: "models.dev refresh addition; not yet curated" },
+	"opencode-zen/gpt-6-luna": { rationale: "models.dev refresh addition; not yet curated" },
+	"opencode-zen/gpt-6-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"opencode-zen/gpt-6.1-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"opencode-zen/grok-4.7": { rationale: "models.dev refresh addition; not yet curated" },
+	"opencode-zen/longcat-2.5-preview-free": { rationale: "models.dev refresh addition; not yet curated" },
+	"opencode-zen/qwen3.8-max": { rationale: "models.dev refresh addition; not yet curated" },
+	"opencode-zen/space-bunny-free": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/aion-labs/aion-3.5": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/aion-labs/aion-3.5-mini": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/anthropic/claude-sonnet-5.5": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/anthropic/claude-sonnet-5.5:batch": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/cohere/command-a-plus": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/fireworks/ember-1": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/openai/gpt-6-luna": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/openai/gpt-6-luna-pro": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/openai/gpt-6-luna-pro:batch": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/openai/gpt-6-luna:batch": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/openai/gpt-6-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/openai/gpt-6-sol:batch": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/openai/gpt-6-sol-pro": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/openai/gpt-6-sol-pro:batch": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/openai/gpt-6.1-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/openai/gpt-6.1-sol-pro": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/openai/gpt-oss-120b:batch": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/perceptron/perceptron-mk1.5": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/qwen/qwen3.8-max-prime": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/qwen/qwen3.8-omni-flash": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/stealth/space-bunny-alpha": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/typesafe/jev-router": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/upstage/solar-mini4": { rationale: "models.dev refresh addition; not yet curated" },
+	"openrouter/z-ai/glm-5.3-prime": { rationale: "models.dev refresh addition; not yet curated" },
+	"venice/aion-labs-aion-3-5": { rationale: "models.dev refresh addition; not yet curated" },
+	"venice/aion-labs-aion-3-5-mini": { rationale: "models.dev refresh addition; not yet curated" },
+	"venice/claude-opus-5-5-fast": { rationale: "models.dev refresh addition; not yet curated" },
+	"venice/claude-sonnet-5-5": { rationale: "models.dev refresh addition; not yet curated" },
+	"venice/openai-gpt-6-luna": { rationale: "models.dev refresh addition; not yet curated" },
+	"venice/openai-gpt-6-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"venice/openai-gpt-61-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"venice/xiaomi-mimo-v2-6-flash": { rationale: "models.dev refresh addition; not yet curated" },
+	"vercel-ai-gateway/alibaba/qwen3.8-max-prime": { rationale: "models.dev refresh addition; not yet curated" },
+	"vercel-ai-gateway/anthropic/claude-sonnet-5.5": { rationale: "models.dev refresh addition; not yet curated" },
+	"vercel-ai-gateway/fireworks/ember-1": { rationale: "models.dev refresh addition; not yet curated" },
+	"vercel-ai-gateway/inclusionai/ling-3.1-flash": { rationale: "models.dev refresh addition; not yet curated" },
+	"vercel-ai-gateway/inclusionai/ling-3.1-flash-free": { rationale: "models.dev refresh addition; not yet curated" },
+	"vercel-ai-gateway/meituan/longcat-2.5-preview": { rationale: "models.dev refresh addition; not yet curated" },
+	"vercel-ai-gateway/openai/gpt-6-luna": { rationale: "models.dev refresh addition; not yet curated" },
+	"vercel-ai-gateway/openai/gpt-6-luna-fast": { rationale: "models.dev refresh addition; not yet curated" },
+	"vercel-ai-gateway/openai/gpt-6-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"vercel-ai-gateway/openai/gpt-6-sol-fast": { rationale: "models.dev refresh addition; not yet curated" },
+	"vercel-ai-gateway/openai/gpt-6.1-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"vercel-ai-gateway/openai/gpt-6.1-sol-fast": { rationale: "models.dev refresh addition; not yet curated" },
+	"zenmux/anthropic/claude-fable-5.1": { rationale: "models.dev refresh addition; not yet curated" },
+	"zenmux/anthropic/claude-opus-5.5": { rationale: "models.dev refresh addition; not yet curated" },
+	"zenmux/deepseek/deepseek-v4.1-flash": { rationale: "models.dev refresh addition; not yet curated" },
+	"zenmux/moonshotai/kimi-k2.7-code-highspeed": { rationale: "models.dev refresh addition; not yet curated" },
+	"zenmux/openai/gpt-6-astra": { rationale: "models.dev refresh addition; not yet curated" },
+	"zenmux/openai/gpt-6-sol": { rationale: "models.dev refresh addition; not yet curated" },
+	"zenmux/xiaomi/mimo-v2.6-pro": { rationale: "models.dev refresh addition; not yet curated" },
 } as const satisfies TierMapSkipList;
 
 export const CURATED_TIER_MAP: AutoroutingCuratedTierMap = {