@gajae-code/coding-agent 0.15.3 → 0.15.5

package/src/commands/sdk.ts

@@ -838,6 +838,10 @@ class SdkSessionHelp extends Command {
 			description: "Workspace directory for saved-session resolution (default: current directory)",
 		}),
 		op: Flags.string({ description: "Raw control or global operation" }),
+		scope: Flags.string({
+			description: "list scope: repo (default), cwd, worktree, or all",
+			options: ["repo", "cwd", "worktree", "all"],
+		}),
 		query: Flags.string({ description: "Raw query name" }),
 		"json-input": Flags.string({ description: "SDK request JSON object" }),
 		"json-input-file": Flags.string({ description: "Read SDK request JSON from a 0600 file" }),
@@ -894,6 +898,7 @@ class SdkSessionCommand extends Command {
 			allEvents: Boolean(flagRec["all-events"]),
 			agentDir: flagRec["agent-dir"] as string | undefined,
 			repo: flagRec.repo as string | undefined,
+			scope: flagRec.scope as string | undefined,
 		});
 	}
 }

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

@@ -146,6 +146,7 @@ export const TIER_MAP_SKIP_LIST = {
 	},
 	"vercel-ai-gateway/google/gemini-3.7-flash": { rationale: "post-rebase catalog addition from dev; not yet curated" },
 	"zai/glm-5.3": { rationale: "post-rebase catalog addition from dev; not yet curated" },
+	"zai/glm-5.3-flash": { rationale: "post-feature catalog addition; not yet curated" },
 	"cursor/gemini-3.7-flash-high": {
 		rationale: "post-rebase catalog addition from dev; not yet curated",
 	},

package/src/config/model-profiles.ts

@@ -247,22 +247,22 @@ export const BUILTIN_MODEL_PROFILES: readonly ModelProfileDefinition[] = [
 		architect: "anthropic/claude-fable-5:xhigh",
 	}),
 	profile("glm-eco", ["zai"], {
-		default: "zai/glm-5.3:low",
-		executor: "zai/glm-5.3:low",
-		planner: "zai/glm-5.3:low",
+		default: "zai/glm-5.3-flash:low",
+		executor: "zai/glm-5.3-flash:low",
+		planner: "zai/glm-5.3-flash:low",
 		critic: "zai/glm-5.3:high",
 		architect: "zai/glm-5.3:high",
 	}),
 	profile("glm-medium", ["zai"], {
 		default: "zai/glm-5.3:high",
-		executor: "zai/glm-5.3:low",
+		executor: "zai/glm-5.3-flash: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.3:max",
-		executor: "zai/glm-5.3:high",
+		executor: "zai/glm-5.3-flash:high",
 		planner: "zai/glm-5.3:high",
 		critic: "zai/glm-5.3:max",
 		architect: "zai/glm-5.3:max",

package/src/config/model-registry.ts

@@ -2154,7 +2154,9 @@ export class ModelRegistry {
 				});
 				if (localCompatResolvedKey) {
 					this.#customProviderApiKeys.set(providerName, localCompatResolvedKey);
-					this.authStorage.setConfigApiKey(providerName, localCompatResolvedKey);
+					this.authStorage.setConfigApiKey(providerName, localCompatResolvedKey, {
+						envSourced: !localOpenAICompat.apiKey,
+					});
 				} else {
 					keylessProviders.add(providerName);
 					this.#optionalAuthProviders.add(providerName);
@@ -2216,7 +2218,9 @@ export class ModelRegistry {
 						? resolveApiKeyEnvConfig(providerConfig.apiKeyEnv)
 						: undefined;
 				if (resolved) this.#customProviderApiKeys.set(providerName, resolved);
-				if (resolved) this.authStorage.setConfigApiKey(providerName, resolved);
+				if (resolved) {
+					this.authStorage.setConfigApiKey(providerName, resolved, { envSourced: !providerConfig.apiKey });
+				}
 			}
 
 			// Parse per-model overrides
@@ -3806,7 +3810,9 @@ export class ModelRegistry {
 						? resolveApiKeyEnvConfig(providerConfig.apiKeyEnv)
 						: undefined;
 				if (resolved) this.#customProviderApiKeys.set(providerName, resolved);
-				if (resolved) this.authStorage.setConfigApiKey(providerName, resolved);
+				if (resolved) {
+					this.authStorage.setConfigApiKey(providerName, resolved, { envSourced: !providerConfig.apiKey });
+				}
 			}
 			for (const modelDef of modelDefs) {
 				const providerCompat = providerConfig.disableStrictTools
@@ -4547,7 +4553,7 @@ export class ModelRegistry {
 			return;
 		}
 		this.#customProviderApiKeys.set(provider, resolved);
-		this.authStorage.setConfigApiKey(provider, resolved);
+		this.authStorage.setConfigApiKey(provider, resolved, { envSourced: true });
 	}
 
 	async #peekApiKeyForProvider(

package/src/config/settings-schema.ts

@@ -1940,6 +1940,52 @@ export const SETTINGS_SCHEMA = {
 		},
 	},
 
+	"compaction.adaptive.enabled": {
+		type: "boolean",
+		default: false,
+		ui: {
+			tab: "context",
+			label: "Adaptive Compaction",
+			description: "Adjust compaction frequency by context size and call rate",
+		},
+	},
+	"compaction.adaptive.baseThresholdPercent": {
+		type: "number",
+		default: 85,
+		ui: {
+			tab: "context",
+			label: "Adaptive Base Threshold %",
+			description: "Base context percentage used when adaptive compaction is enabled",
+		},
+	},
+	"compaction.adaptive.aggression": {
+		type: "number",
+		default: 0.15,
+		ui: {
+			tab: "context",
+			label: "Adaptive Aggression",
+			description: "How strongly call rate lowers the compaction threshold; use 0 to 1",
+		},
+	},
+	"compaction.adaptive.turnWindow": {
+		type: "number",
+		default: 15,
+		ui: {
+			tab: "context",
+			label: "Call-Rate Window",
+			description: "Minutes of recent calls considered by adaptive compaction",
+		},
+	},
+	"compaction.adaptive.minThresholdPercent": {
+		type: "number",
+		default: 50,
+		ui: {
+			tab: "context",
+			label: "Adaptive Floor %",
+			description: "Lowest context percentage adaptive compaction may lower the threshold to",
+		},
+	},
+
 	"compaction.handoffSaveToDisk": {
 		type: "boolean",
 		default: false,
@@ -4332,6 +4378,13 @@ export interface CompactionSettings {
 	strategy: "context-full" | "handoff" | "off";
 	thresholdPercent: number;
 	thresholdTokens: number;
+	adaptive: {
+		enabled: boolean;
+		baseThresholdPercent: number;
+		aggression: number;
+		turnWindow: number;
+		minThresholdPercent: number;
+	};
 	reserveTokens: number;
 	keepRecentTokens: number;
 	handoffSaveToDisk: boolean;

package/src/config/settings.ts

@@ -1174,7 +1174,7 @@ export class Settings implements NotificationSettingsReader {
 		for (const key of Object.keys(SETTINGS_SCHEMA) as SettingPath[]) {
 			if (key.startsWith(`${prefix}.`)) {
 				const suffix = key.slice(prefix.length + 1);
-				result[suffix] = this.get(key);
+				setByPath(result, suffix.split("."), this.get(key));
 			}
 		}
 		return result as unknown as GroupTypeMap[G];

package/src/coordinator-mcp/policy.ts

@@ -112,7 +112,7 @@ function parseRootList(value: string | undefined): string[] {
 }
 
 function resolveManagedWorktreeRoot(root: string, configured: string | undefined): string {
-	const template = (configured?.trim() || "{repo}.gajae-code-worktrees").replace(/^~(?=\/|$)/, os.homedir());
+	const template = (configured?.trim() || "{repo}/.worktrees").replace(/^~(?=\/|$)/, os.homedir());
 	const resolved = template.replaceAll("{repo}", path.basename(root));
 	return path.resolve(path.isAbsolute(resolved) ? resolved : path.join(path.dirname(root), resolved));
 }

package/src/deep-interview/render-middleware.ts

@@ -10,6 +10,7 @@ import {
 	type ViewportAnchorSource,
 	type ViewportAnchorSourceRenderer,
 } from "@gajae-code/tui";
+import { isLegacyDeepInterviewPlaceholder, isWorkflowPlaceholderText } from "../gjc-runtime/workflow-placeholder";
 import { getMarkdownTheme, type Theme } from "../modes/theme/theme";
 
 interface RoundQuestionModel {
@@ -132,7 +133,7 @@ function parseRoundQuestion(text: string): RoundQuestionModel | null {
 		.slice(headerIndex + 1)
 		.join("\n")
 		.trim();
-	if (!body) return null;
+	if (isWorkflowPlaceholderText(body)) return null;
 
 	const componentMatch =
 		/^Round\s+(\d+)\s+\|\s+Component:\s*(.*?)\s+\|\s+Targeting:\s*(.*?)\s+\|\s+Why now:\s*(.*?)\s+\|\s+Ambiguity:\s*(.+?)%?\s*$/i.exec(
@@ -204,11 +205,13 @@ function parseTopologyQuestion(text: string): TopologyQuestionModel | null {
 		if (inQuestion) questionLines.push(trimmed);
 		else contextLines.push(trimmed);
 	}
+	const question = questionLines.join("\n");
+	if (isWorkflowPlaceholderText(question)) return null;
 	return {
 		kind: "topology-question",
 		context: contextLines.join("\n") || undefined,
 		components,
-		question: questionLines.join("\n"),
+		question,
 	};
 }
 
@@ -399,6 +402,7 @@ export function renderDeepInterviewAskQuestion(question: string, uiTheme: Theme)
 export function isDeepInterviewAskQuestion(question: string): boolean {
 	if (parseTopologyQuestion(question) ?? parseRoundQuestion(question)) return true;
 	const normalized = normalizeText(question);
+	if (isLegacyDeepInterviewPlaceholder(normalized)) return false;
 	return /(?:^|\n)\s*Round\s+\d+\s*\|.*?\bAmbiguity\b/i.test(normalized);
 }
 

package/src/extensibility/extensions/types.ts

@@ -155,6 +155,8 @@ export interface ExtensionUIDialogOptions {
 	customInput?: {
 		optionLabel: string;
 		onSubmit: (text: string) => void;
+		/** Empty/whitespace-only submissions may be rejected by the selector. */
+		allowEmpty?: boolean;
 	};
 	/**
 	 * Inline free-text input for a non-answer clarification action. It is
@@ -534,6 +536,7 @@ export interface ExtensionContext {
 			onPreflightAcceptCommit?: () => void | Promise<void>;
 			onSkillPrepared?: (meta: { name: string; path: string; lineCount?: number; cleanedArgs?: string }) => void;
 			preflightSignal?: AbortSignal;
+			sdkRunToken?: string;
 		},
 	): Promise<unknown>;
 	setPlanMode?(on: boolean): unknown;
@@ -752,6 +755,8 @@ export interface AgentStartEvent extends SharedAgentStartEvent {
 export interface AgentFailedEvent {
 	type: "agent_failed";
 	error: AgentFailureDiagnostic;
+	/** Internal SDK queue-owner binding for exact lifecycle attribution. */
+	sdkRunToken?: string;
 	/** Attempt correlation for the failing run, when scoped (matches the
 	 * agent_start/agent_end scope contract). */
 	scope?: AttemptScope;

package/src/extensibility/shared-events.ts

@@ -184,6 +184,8 @@ export interface AgentStartEvent {
 export interface AgentEndEvent {
 	type: "agent_end";
 	messages: AgentMessage[];
+	/** Internal SDK queue-owner binding for exact lifecycle attribution. */
+	sdkRunToken?: string;
 	/** Indicates whether the loop ended normally, suspended, cancelled, or entered maintenance. */
 	stopReason?: "completed" | "paused" | "cancelled" | "maintenance";
 	/** Present for maintenance checkpoints; non-aborted checkpoints are not terminal. */

package/src/gjc-runtime/launch-worktree.ts

@@ -78,7 +78,7 @@ const WORKTREE_BUCKET_ENV = "GJC_WORKTREE_DIR";
  * what keeps two repositories that share a branch name from resolving to one worktree.
  */
 const REPO_NAME_PLACEHOLDER = "{repo}";
-const DEFAULT_WORKTREE_BUCKET = `${REPO_NAME_PLACEHOLDER}.gajae-code-worktrees`;
+const DEFAULT_WORKTREE_BUCKET = `${REPO_NAME_PLACEHOLDER}/.worktrees`;
 
 function expandHomePrefix(value: string, home: string, pathApi: typeof path.posix): string {
 	if (value === "~") return home;
@@ -108,14 +108,36 @@ export function resolveWorktreeBucketForPath(
 /**
  * Directory that holds this repository's launch worktrees.
  *
- * A relative override resolves against the repository's PARENT directory, matching the
- * default's own shape, so `{repo}.worktrees` adopts an existing sibling bucket and
- * `.worktrees` parks a hidden bucket beside the repository. An absolute override is used verbatim.
+ * A relative override resolves against the repository's parent directory. The default
+ * `{repo}/.worktrees` template places managed worktrees inside the repository, while
+ * `{repo}.worktrees` adopts an existing sibling bucket. An absolute override is used verbatim.
  */
 function resolveWorktreeBucket(repoRoot: string): string {
 	return resolveWorktreeBucketForPath(repoRoot, process.env[WORKTREE_BUCKET_ENV], os.homedir(), path);
 }
 
+function ensureRepositoryBucketIgnored(repoRoot: string, bucketPath: string): void {
+	const relativeBucket = path.relative(repoRoot, bucketPath);
+	if (relativeBucket.startsWith(`..${path.sep}`) || relativeBucket === ".." || path.isAbsolute(relativeBucket)) return;
+	const ignoreProbe = path.join(relativeBucket, ".gjc-worktree-probe");
+	for (const candidate of [relativeBucket, ignoreProbe]) {
+		const result = Bun.spawnSync(["git", "check-ignore", "--quiet", "--", candidate], {
+			cwd: repoRoot,
+			stdout: "ignore",
+			stderr: "pipe",
+		});
+		if (result.exitCode === 0) return;
+	}
+	throw new Error(
+		[
+			"worktree_bucket_not_ignored",
+			"The GJC launch worktree bucket is inside the repository but is not ignored by Git.",
+			`Path: ${formatBucketPath(bucketPath)}`,
+			`Safe remediation: add /${relativeBucket.replaceAll(path.sep, "/")} to ${path.join(repoRoot, ".gitignore")}, then relaunch.`,
+		].join("\n"),
+	);
+}
+
 function resolveSourceBranchSlug(repoRoot: string, baseRef: string): string {
 	const branch = tryRunGit(repoRoot, ["symbolic-ref", "--quiet", "--short", "HEAD"]);
 	if (branch) return sanitizePathToken(branch);
@@ -301,6 +323,7 @@ function pruneStaleWorktreePath(repoRoot: string): void {
 
 function readWorktreeEntryFromPath(repoRoot: string, worktreePath: string): GitWorktreeEntry | null {
 	if (!fs.existsSync(worktreePath)) return null;
+	if (!fs.existsSync(path.join(worktreePath, ".git"))) return null;
 	const repoCommonDir = tryRunGit(repoRoot, ["rev-parse", "--git-common-dir"]);
 	const worktreeCommonDir = tryRunGit(worktreePath, ["rev-parse", "--git-common-dir"]);
 	if (!repoCommonDir || !worktreeCommonDir) return null;
@@ -379,6 +402,7 @@ export function planLaunchWorktree(
 	if (branchName) validateBranchName(repoRoot, branchName);
 	const worktreeSlug = mode.detached ? resolveSourceBranchSlug(repoRoot, baseRef) : sanitizePathToken(mode.name);
 	const worktreePath = path.join(resolveWorktreeBucket(repoRoot), worktreeSlug);
+	if (path.resolve(worktreePath) === path.resolve(repoRoot)) throw new Error(`worktree_path_conflict:${worktreePath}`);
 	return { enabled: true, repoRoot, worktreePath, detached: mode.detached, baseRef, branchName };
 }
 
@@ -386,6 +410,9 @@ export function ensureLaunchWorktree(
 	plan: GjcLaunchWorktreePlan | { enabled: false },
 ): GjcLaunchWorktreeResult | { enabled: false } {
 	if (!plan.enabled) return { enabled: false };
+	const bucketPath = path.dirname(plan.worktreePath);
+	inspectBucketDir(bucketPath);
+	ensureRepositoryBucketIgnored(plan.repoRoot, bucketPath);
 	let allWorktrees = listWorktrees(plan.repoRoot);
 	const staleAtPath = findWorktreeByPath(allWorktrees, plan.worktreePath);
 	if (staleAtPath && !fs.existsSync(staleAtPath.path)) {
@@ -393,9 +420,19 @@ export function ensureLaunchWorktree(
 		allWorktrees = listWorktrees(plan.repoRoot);
 	}
 
-	const existingAtPath =
-		findWorktreeByPath(allWorktrees, plan.worktreePath) ??
-		readWorktreeEntryFromPath(plan.repoRoot, plan.worktreePath);
+	const listedAtPath = findWorktreeByPath(allWorktrees, plan.worktreePath);
+	const existingAtPath = readWorktreeEntryFromPath(plan.repoRoot, plan.worktreePath);
+	if (listedAtPath && !existingAtPath) {
+		if (fs.existsSync(plan.worktreePath)) throw new Error(`worktree_path_conflict:${plan.worktreePath}`);
+		throw new Error(
+			[
+				"worktree_path_unavailable",
+				"The requested launch worktree is still registered by Git but its directory is unavailable or locked.",
+				`Path: ${formatBucketPath(plan.worktreePath)}`,
+				"Safe remediation: inspect the worktree lock and remove or repair it with git worktree remove/prune when it is no longer needed, then relaunch. GJC did not delete or replace the entry.",
+			].join("\n"),
+		);
+	}
 	const expectedBranchRef = plan.branchName ? `refs/heads/${plan.branchName}` : null;
 
 	if (existingAtPath) {

package/src/gjc-runtime/ralplan-runtime.ts

@@ -747,13 +747,31 @@ export async function resolveRalplanTargetRoot(
 	if (!repository) {
 		throw new RalplanCommandError(2, `ralplan --worktree-root is not inside a git repository: ${canonical}`);
 	}
-	const verified = Bun.spawn(["git", "-C", canonical, "rev-parse", "--verify", "HEAD^{commit}"], {
+	// Do not pass the caret-containing `HEAD^{commit}` revision here. On Windows,
+	// Bun may dispatch git through a `.cmd` shim, where `^` is interpreted by the
+	// command shell before git receives the argument. HEAD is sufficient after
+	// resolving a repository root: an unborn or non-commit HEAD still fails the
+	// same validation, while the argv remains shell-safe on every platform.
+	const verified = Bun.spawn(["git", "-C", canonical, "rev-parse", "--verify", "HEAD"], {
 		stdout: "pipe",
 		stderr: "pipe",
 	});
-	if ((await verified.exited) !== 0) {
+	const [verifiedStatus, verifiedOutput] = await Promise.all([verified.exited, new Response(verified.stdout).text()]);
+	const headObject = verifiedOutput.trim();
+	if (verifiedStatus !== 0 || !/^[0-9a-f]{40,64}$/u.test(headObject)) {
 		throw new RalplanCommandError(2, `ralplan --worktree-root is not a valid git worktree: ${canonical}`);
 	}
+	const objectType = Bun.spawn(["git", "-C", canonical, "cat-file", "-t", headObject], {
+		stdout: "pipe",
+		stderr: "pipe",
+	});
+	const [objectTypeStatus, objectTypeOutput] = await Promise.all([
+		objectType.exited,
+		new Response(objectType.stdout).text(),
+	]);
+	if (objectTypeStatus !== 0 || objectTypeOutput.trim() !== "commit") {
+		throw new RalplanCommandError(2, `ralplan --worktree-root is not a commit worktree: ${canonical}`);
+	}
 	let worktreeRoot: string;
 	try {
 		worktreeRoot = await fs.realpath(repository.repoRoot);