@gajae-code/coding-agent 0.3.1 → 0.4.0

package/src/session/session-storage.ts

@@ -40,7 +40,9 @@ export interface SessionStorage {
 	readTextPrefix(path: string, maxBytes: number): Promise<string>;
 	writeText(path: string, content: string): Promise<void>;
 	rename(path: string, nextPath: string): Promise<void>;
+	renameSync(path: string, nextPath: string): void;
 	unlink(path: string): Promise<void>;
+	unlinkSync(path: string): void;
 	deleteSessionWithArtifacts(sessionPath: string): Promise<void>;
 	openWriter(path: string, options?: { flags?: "a" | "w"; onError?: (err: Error) => void }): SessionStorageWriter;
 }
@@ -198,10 +200,22 @@ export class FileSessionStorage implements SessionStorage {
 		}
 	}
 
+	renameSync(path: string, nextPath: string): void {
+		try {
+			fs.renameSync(path, nextPath);
+		} catch (err) {
+			throw toError(err);
+		}
+	}
+
 	unlink(path: string): Promise<void> {
 		return fs.promises.unlink(path);
 	}
 
+	unlinkSync(path: string): void {
+		fs.unlinkSync(path);
+	}
+
 	openWriter(path: string, options?: { flags?: "a" | "w"; onError?: (err: Error) => void }): SessionStorageWriter {
 		return new FileSessionStorageWriter(path, options);
 	}
@@ -375,10 +389,22 @@ export class MemorySessionStorage implements SessionStorage {
 		return Promise.resolve();
 	}
 
+	renameSync(path: string, nextPath: string): void {
+		const entry = this.#files.get(path);
+		if (!entry) throw new Error(`File not found: ${path}`);
+		this.#files.set(nextPath, entry);
+		this.#files.delete(path);
+	}
+
 	unlink(path: string): Promise<void> {
 		this.#files.delete(path);
 		return Promise.resolve();
 	}
+
+	unlinkSync(path: string): void {
+		this.#files.delete(path);
+	}
+
 	deleteSessionWithArtifacts(_sessionPath: string): Promise<void> {
 		return Promise.resolve();
 	}

package/src/setup/provider-onboarding.ts

@@ -79,7 +79,7 @@ export const PROVIDER_PRESETS: readonly ProviderPreset[] = [
 		providerId: "minimax-code",
 		baseUrl: "https://api.minimax.io/v1",
 		apiKeyEnv: "MINIMAX_CODE_API_KEY",
-		models: ["MiniMax-M2.5"],
+		models: ["minimax-m3"],
 		compat: MINIMAX_OPENAI_COMPAT,
 	},
 	{
@@ -92,7 +92,7 @@ export const PROVIDER_PRESETS: readonly ProviderPreset[] = [
 		providerId: "minimax-code-cn",
 		baseUrl: "https://api.minimaxi.com/v1",
 		apiKeyEnv: "MINIMAX_CODE_CN_API_KEY",
-		models: ["MiniMax-M2.5"],
+		models: ["minimax-m3"],
 		compat: MINIMAX_OPENAI_COMPAT,
 	},
 	{

package/src/skill-state/active-state.ts

@@ -32,6 +32,17 @@ export interface WorkflowHudSummary {
 
 export type { WorkflowStateReceipt } from "./workflow-state-contract";
 
+export interface ActiveSubskillEntry {
+	plugin: string;
+	subskillName: string;
+	parent: string;
+	bindsTo: string;
+	phase: string;
+	activationArg: string;
+	filePath: string;
+	toolPaths: string[];
+}
+
 export interface SkillActiveEntry {
 	skill: string;
 	phase?: string;
@@ -47,6 +58,7 @@ export interface SkillActiveEntry {
 	handoff_from?: string;
 	handoff_to?: string;
 	handoff_at?: string;
+	active_subskills?: ActiveSubskillEntry[];
 }
 
 export interface SkillActiveState {
@@ -64,6 +76,7 @@ export interface SkillActiveState {
 	initialized_mode?: CanonicalGjcWorkflowSkill;
 	initialized_state_path?: string;
 	active_skills?: SkillActiveEntry[];
+	active_subskills?: ActiveSubskillEntry[];
 	[key: string]: unknown;
 }
 
@@ -87,6 +100,7 @@ export interface SyncSkillActiveStateOptions {
 	handoff_from?: string;
 	handoff_to?: string;
 	handoff_at?: string;
+	active_subskills?: ActiveSubskillEntry[];
 }
 
 const HUD_TEXT_LIMIT = 80;
@@ -188,6 +202,48 @@ function normalizeWorkflowStateReceipt(raw: unknown): WorkflowStateReceipt | und
 		mutation_id: mutationId,
 	};
 }
+function normalizeActiveSubskillEntry(raw: unknown): ActiveSubskillEntry | null {
+	if (!raw || typeof raw !== "object") return null;
+	const record = raw as Record<string, unknown>;
+	const plugin = safeString(record.plugin).trim();
+	const subskillName = safeString(record.subskillName).trim();
+	const parent = safeString(record.parent).trim();
+	const bindsTo = safeString(record.bindsTo).trim();
+	const phase = safeString(record.phase).trim();
+	const activationArg = safeString(record.activationArg).trim();
+	const filePath = safeString(record.filePath).trim();
+	const toolPaths = Array.isArray(record.toolPaths)
+		? record.toolPaths.map(item => safeString(item).trim()).filter(Boolean)
+		: [];
+	if (!plugin || !subskillName || !parent || !bindsTo || !phase || !activationArg || !filePath) return null;
+	return { plugin, subskillName, parent, bindsTo, phase, activationArg, filePath, toolPaths };
+}
+
+function normalizeActiveSubskillEntries(raw: unknown): ActiveSubskillEntry[] | undefined {
+	if (!Array.isArray(raw)) return undefined;
+	const entries = raw
+		.map(normalizeActiveSubskillEntry)
+		.filter((entry): entry is ActiveSubskillEntry => entry !== null);
+	return entries.length > 0 ? entries : undefined;
+}
+
+function activeSubskillEntryKey(entry: ActiveSubskillEntry): string {
+	return [entry.plugin, entry.parent, entry.phase, entry.activationArg].join("\0");
+}
+
+function unionActiveSubskillEntries(...entrySets: Array<ActiveSubskillEntry[] | undefined>): ActiveSubskillEntry[] {
+	const merged: ActiveSubskillEntry[] = [];
+	const seen = new Set<string>();
+	for (const entries of entrySets) {
+		for (const entry of entries ?? []) {
+			const key = activeSubskillEntryKey(entry);
+			if (seen.has(key)) continue;
+			seen.add(key);
+			merged.push(entry);
+		}
+	}
+	return merged;
+}
 
 function encodePathSegment(value: string): string {
 	return encodeURIComponent(value).replaceAll(".", "%2E");
@@ -204,6 +260,7 @@ function normalizeEntry(raw: unknown): SkillActiveEntry | null {
 	if (!skill) return null;
 	const hud = normalizeWorkflowHudSummary(record.hud);
 	const receipt = normalizeWorkflowStateReceipt(record.receipt);
+	const activeSubskills = normalizeActiveSubskillEntries(record.active_subskills);
 	return {
 		...record,
 		skill,
@@ -219,6 +276,7 @@ function normalizeEntry(raw: unknown): SkillActiveEntry | null {
 		handoff_at: safeString(record.handoff_at).trim() || undefined,
 		...(hud ? { hud } : {}),
 		...(receipt ? { receipt } : {}),
+		...(activeSubskills ? { active_subskills: activeSubskills } : {}),
 		stale: undefined,
 	};
 }
@@ -278,6 +336,7 @@ export function normalizeSkillActiveState(raw: unknown): SkillActiveState | null
 		session_id: safeString(state.session_id).trim() || primary?.session_id || undefined,
 		thread_id: safeString(state.thread_id).trim() || primary?.thread_id || undefined,
 		turn_id: safeString(state.turn_id).trim() || primary?.turn_id || undefined,
+		active_subskills: activeSkills.flatMap(entry => entry.active_subskills ?? []),
 		active_skills: activeSkills.length > 0 ? activeSkills : [],
 	};
 }
@@ -512,6 +571,7 @@ export async function readVisibleSkillActiveState(cwd: string, sessionId?: strin
 		phase: primary?.phase ?? "",
 		session_id: safeString(sessionId).trim() || primary?.session_id,
 		active_skills: activeSkills,
+		active_subskills: activeSkills.flatMap(entry => entry.active_subskills ?? []),
 	};
 }
 
@@ -552,7 +612,25 @@ async function rebuildActiveState(cwd: string, sessionScope?: ActiveSessionScope
 	await rebuildActiveSnapshot(cwd, sessionScope, { cwd, audit: activeStateWriterAudit("rebuild-active-snapshot") });
 }
 
+async function activeSubskillsForExistingEntry(
+	cwd: string,
+	sessionId: string | undefined,
+	skill: string,
+): Promise<ActiveSubskillEntry[] | undefined> {
+	const { rootPath, sessionPath } = getSkillActiveStatePaths(cwd, sessionId);
+	const [rootState, sessionState] = await Promise.all([
+		readRawActiveStateForHandoff(rootPath, false),
+		sessionPath ? readRawActiveStateForHandoff(sessionPath, false) : Promise.resolve(null),
+	]);
+	const existing = mergeVisibleEntries(sessionState, rootState, sessionId).find(entry => entry.skill === skill);
+	return existing?.active_subskills;
+}
+
 export async function syncSkillActiveState(options: SyncSkillActiveStateOptions): Promise<void> {
+	const preservedActiveSubskills =
+		options.active_subskills === undefined
+			? await activeSubskillsForExistingEntry(options.cwd, options.sessionId, options.skill)
+			: undefined;
 	const nowIso = options.nowIso ?? new Date().toISOString();
 	const hud = normalizeWorkflowHudSummary(options.hud);
 	const entry: SkillActiveEntry = {
@@ -569,6 +647,11 @@ export async function syncSkillActiveState(options: SyncSkillActiveStateOptions)
 		...(options.handoff_at ? { handoff_at: options.handoff_at } : {}),
 		...(hud ? { hud } : {}),
 		...(options.receipt ? { receipt: options.receipt } : {}),
+		...(options.active_subskills !== undefined
+			? { active_subskills: options.active_subskills }
+			: preservedActiveSubskills
+				? { active_subskills: preservedActiveSubskills }
+				: {}),
 	};
 	await persistActiveEntry(options.cwd, undefined, entry);
 	await rebuildActiveState(options.cwd);
@@ -636,9 +719,13 @@ export async function applyHandoffToActiveState(options: ApplyHandoffOptions): P
 					...(priorCaller.handoff_from && !callerEntry.handoff_from
 						? { handoff_from: priorCaller.handoff_from }
 						: {}),
+					...(priorCaller.active_subskills ? { active_subskills: priorCaller.active_subskills } : {}),
 				}
 			: callerEntry;
-		return [...kept, mergedCaller, calleeEntry];
+		const activeSubskills = unionActiveSubskillEntries(priorCaller?.active_subskills, calleeEntry.active_subskills);
+		const mergedCallee: SkillActiveEntry =
+			activeSubskills.length > 0 ? { ...calleeEntry, active_subskills: activeSubskills } : calleeEntry;
+		return [...kept, mergedCaller, mergedCallee];
 	};
 	const writeEntries = async (
 		sessionScope: ActiveSessionScope | undefined,
@@ -675,5 +762,6 @@ function buildSyncEntry(options: SyncSkillActiveStateOptions, nowIso: string): S
 		...(options.handoff_at ? { handoff_at: options.handoff_at } : {}),
 		...(hud ? { hud } : {}),
 		...(options.receipt ? { receipt: options.receipt } : {}),
+		...(options.active_subskills ? { active_subskills: options.active_subskills } : {}),
 	};
 }

package/src/slash-commands/builtin-registry.ts

@@ -748,7 +748,7 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<SlashCommandSpec> = [
 				return;
 			}
 
-			void runtime.ctx.showOAuthSelector("login");
+			runtime.ctx.showProviderOnboarding();
 			runtime.ctx.editor.setText("");
 		},
 	},

package/src/task/discovery.ts

@@ -15,6 +15,7 @@ import { logger } from "@gajae-code/utils";
 import { isProviderEnabled } from "../capability";
 import { findAllNearestProjectConfigDirs, getConfigDirs } from "../config";
 import { listClaudePluginRoots } from "../discovery/helpers";
+import { rootContainsGjcManifest } from "../extensibility/gjc-plugins/paths";
 import { loadBundledAgents, parseAgent } from "./agents";
 import type { AgentDefinition, AgentSource } from "./types";
 
@@ -93,7 +94,12 @@ export async function discoverAgents(cwd: string, home: string = os.homedir()):
 	const { roots: pluginRoots } = isProviderEnabled("claude-plugins")
 		? await listClaudePluginRoots(home, resolvedCwd)
 		: { roots: [] };
-	const sortedPluginRoots = [...pluginRoots].sort((a, b) => {
+	const nonGjcPluginRoots = [];
+	for (const plugin of pluginRoots) {
+		if (await rootContainsGjcManifest(plugin.path)) continue;
+		nonGjcPluginRoots.push(plugin);
+	}
+	const sortedPluginRoots = nonGjcPluginRoots.sort((a, b) => {
 		if (a.scope === b.scope) return 0;
 		return a.scope === "project" ? -1 : 1;
 	});

package/src/task/executor.ts

@@ -19,6 +19,7 @@ import { Settings } from "../config/settings";
 import { SETTINGS_SCHEMA, type SettingPath } from "../config/settings-schema";
 import { runExtensionCompact, runExtensionSetModel } from "../extensibility/extensions/compact-handler";
 import { getSessionSlashCommands } from "../extensibility/extensions/get-commands-handler";
+import { buildAgentSubskillInjection } from "../extensibility/gjc-plugins";
 import { buildSkillPromptMessage, type Skill } from "../extensibility/skills";
 import type { HindsightSessionState } from "../hindsight/state";
 import type { LocalProtocolOptions } from "../internal-urls";
@@ -123,6 +124,7 @@ export interface ExecutorOptions {
 	 * if the resolved subagent model has no working credentials. See #985.
 	 */
 	parentActiveModelPattern?: string;
+	parentSessionId?: string;
 	thinkingLevel?: ThinkingLevel;
 	outputSchema?: unknown;
 	/** Parent task recursion depth (0 = top-level, 1 = first child, etc.) */
@@ -1094,6 +1096,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 					options.parentActiveModelPattern,
 					modelRegistry,
 					settings,
+					options.parentSessionId,
 				),
 			);
 			if (authFallbackUsed && model) {
@@ -1157,6 +1160,12 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 				? `This subagent was started with a forked snapshot of the parent conversation. Included ${options.forkContextSeed.metadata.includedMessages} message(s), skipped ${options.forkContextSeed.metadata.skippedMessages}, approximately ${options.forkContextSeed.metadata.approximateTokens} tokens. The snapshot is not live; use IRC for live coordination when enabled.`
 				: "";
 
+			const agentSubskillBlock = await buildAgentSubskillInjection({
+				cwd,
+				sessionId: options.parentSessionId,
+				agentName: agent.name,
+			});
+
 			const { session } = await awaitAbortable(
 				createAgentSession({
 					cwd: worktree ?? cwd,
@@ -1183,15 +1192,22 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 							ircSelfId: ircEnabled ? id : "",
 							forkContext: forkContextNotice,
 						});
+						const promptWithSubskills = `${subagentPrompt}${agentSubskillBlock}`;
 						return defaultPrompt.length === 0
-							? [subagentPrompt]
-							: [...defaultPrompt.slice(0, -1), subagentPrompt, defaultPrompt[defaultPrompt.length - 1]];
+							? [promptWithSubskills]
+							: [...defaultPrompt.slice(0, -1), promptWithSubskills, defaultPrompt[defaultPrompt.length - 1]];
 					},
 					sessionManager,
 					hasUI: false,
 					spawns: spawnsEnv,
 					taskDepth: childDepth,
 					currentAgentType: agent.name,
+					gjcSubskillToolContext: {
+						cwd,
+						sessionId: options.parentSessionId,
+						parent: agent.name,
+						phase: "prompt",
+					},
 					parentHindsightSessionState: options.parentHindsightSessionState,
 					parentTaskPrefix: id,
 					agentId: id,

package/src/task/index.ts

@@ -1310,6 +1310,7 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 						taskDepth,
 						modelOverride,
 						parentActiveModelPattern,
+						parentSessionId: this.session.getSessionId?.() ?? undefined,
 						thinkingLevel: thinkingLevelOverride,
 						outputSchema: effectiveOutputSchema,
 						sessionFile: taskSessionFile,
@@ -1369,6 +1370,7 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 						taskDepth,
 						modelOverride,
 						parentActiveModelPattern,
+						parentSessionId: this.session.getSessionId?.() ?? undefined,
 						thinkingLevel: thinkingLevelOverride,
 						outputSchema: effectiveOutputSchema,
 						sessionFile: taskSessionFile,

package/src/thinking.ts

@@ -1,5 +1,6 @@
-import { type ResolvedThinkingLevel, ThinkingLevel } from "@gajae-code/agent-core";
-import { clampThinkingLevelForModel, type Effort, type Model, THINKING_EFFORTS } from "@gajae-code/ai";
+import { type ResolvedThinkingLevel, ThinkingLevel } from "@gajae-code/agent-core/thinking";
+import { clampThinkingLevelForModel, type Effort, THINKING_EFFORTS } from "@gajae-code/ai/model-thinking";
+import type { Model } from "@gajae-code/ai/types";
 
 /**
  * Metadata used to render thinking selector values in the coding-agent UI.
@@ -34,6 +35,11 @@ const THINKING_LEVEL_METADATA: Record<ThinkingLevel, ThinkingLevelMetadata> = {
 		label: "xhigh",
 		description: "Maximum reasoning (~32k tokens)",
 	},
+	[ThinkingLevel.Max]: {
+		value: ThinkingLevel.Max,
+		label: "max",
+		description: "Opus maximum reasoning",
+	},
 };
 
 const THINKING_LEVELS = new Set<string>([ThinkingLevel.Inherit, ThinkingLevel.Off, ...THINKING_EFFORTS]);

package/src/tools/ask.ts

@@ -34,6 +34,7 @@ import {
 	renderDeepInterviewAskQuestion,
 } from "../deep-interview/render-middleware";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import { gateAnswerToResult, questionToGate } from "../modes/shared/agent-wire/deep-interview-gate";
 import { getMarkdownTheme, type Theme, theme } from "../modes/theme/theme";
 import askDescription from "../prompts/tools/ask.md" with { type: "text" };
 import { renderStatusLine } from "../tui";
@@ -425,7 +426,7 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 	}
 
 	static createIf(session: ToolSession): AskTool | null {
-		return session.hasUI ? new AskTool(session) : null;
+		return session.hasUI || session.getWorkflowGateEmitter?.() ? new AskTool(session) : null;
 	}
 
 	/** Send terminal notification when ask tool is waiting for input */
@@ -442,17 +443,25 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 		_onUpdate?: AgentToolUpdateCallback<AskToolDetails>,
 		context?: AgentToolContext,
 	): Promise<AgentToolResult<AskToolDetails>> {
-		// Headless fallback
-		if (!context?.hasUI || !context.ui) {
+		const gateEmitter = this.session.getWorkflowGateEmitter?.();
+		const canUseWorkflowGate = gateEmitter?.isUnattended() === true;
+
+		// Headless fallback: unattended workflow gates are the non-TUI answer path.
+		if (!canUseWorkflowGate && (!context?.hasUI || !context.ui)) {
 			context?.abort();
 			throw new ToolAbortError("Ask tool requires interactive mode");
 		}
 
-		const extensionUi = context.ui;
+		const extensionUi = context?.ui;
 		const ui: UIContext = {
-			select: (prompt, options, dialogOptions) => extensionUi.select(prompt, options, dialogOptions),
-			editor: (title, prefill, dialogOptions, editorOptions) =>
-				extensionUi.editor(title, prefill, dialogOptions, editorOptions),
+			select: (prompt, options, dialogOptions) => {
+				if (!extensionUi) throw new ToolAbortError("Ask tool requires interactive mode");
+				return extensionUi.select(prompt, options, dialogOptions);
+			},
+			editor: (title, prefill, dialogOptions, editorOptions) => {
+				if (!extensionUi) throw new ToolAbortError("Ask tool requires interactive mode");
+				return extensionUi.editor(title, prefill, dialogOptions, editorOptions);
+			},
 		};
 
 		// Determine timeout based on settings and plan mode
@@ -477,6 +486,27 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 			options?: { previous?: QuestionResult; navigation?: NavigationControls },
 		) => {
 			const rawOptionLabels = q.options.map(o => o.label);
+			// Unattended (#316/#323/G011): route the question through the workflow-gate
+			// emitter instead of the interactive UI; the external agent answers over RPC.
+			if (gateEmitter && canUseWorkflowGate) {
+				const gateQuestion = {
+					id: q.id,
+					question: q.question,
+					options: q.options,
+					multi: q.multi,
+					recommended: q.recommended,
+				};
+				const answer = await gateEmitter.emitGate(questionToGate(gateQuestion));
+				const decoded = gateAnswerToResult(gateQuestion, answer);
+				return {
+					optionLabels: rawOptionLabels,
+					selectedOptions: decoded.selectedOptions,
+					customInput: decoded.customInput,
+					navigation: undefined as NavigationControls | undefined,
+					cancelled: false,
+					timedOut: false,
+				};
+			}
 			try {
 				const deepInterviewPrompt = formatDeepInterviewSelectorPrompt(q.question);
 				const displayQuestion = deepInterviewPrompt ?? q.question;
@@ -529,7 +559,7 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 			const { optionLabels, selectedOptions, customInput, cancelled, timedOut } = await askQuestion(q);
 
 			if (!timedOut && (cancelled || (selectedOptions.length === 0 && customInput === undefined))) {
-				context.abort();
+				context?.abort();
 				throw new ToolAbortError("Ask tool was cancelled by the user");
 			}
 			const details: AskToolDetails = {
@@ -581,7 +611,7 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 			} = await askQuestion(q, { previous, navigation });
 
 			if (cancelled && !timedOut) {
-				context.abort();
+				context?.abort();
 				throw new ToolAbortError("Ask tool was cancelled by the user");
 			}
 

package/src/tools/hindsight-recall.ts

@@ -17,8 +17,6 @@ export class HindsightRecallTool implements AgentTool<typeof hindsightRecallSche
 	readonly description = recallDescription;
 	readonly parameters = hindsightRecallSchema;
 	readonly strict = true;
-	readonly loadMode = "discoverable";
-	readonly summary = "Search hindsight memory for relevant prior context";
 
 	constructor(private readonly session: ToolSession) {}
 

package/src/tools/hindsight-reflect.ts

@@ -18,8 +18,6 @@ export class HindsightReflectTool implements AgentTool<typeof hindsightReflectSc
 	readonly description = reflectDescription;
 	readonly parameters = hindsightReflectSchema;
 	readonly strict = true;
-	readonly loadMode = "discoverable";
-	readonly summary = "Reflect on recent work and write hindsight memory";
 
 	constructor(private readonly session: ToolSession) {}
 

package/src/tools/hindsight-retain.ts

@@ -22,8 +22,6 @@ export class HindsightRetainTool implements AgentTool<typeof hindsightRetainSche
 	readonly description = retainDescription;
 	readonly parameters = hindsightRetainSchema;
 	readonly strict = true;
-	readonly loadMode = "discoverable";
-	readonly summary = "Store important facts in hindsight memory";
 
 	constructor(private readonly session: ToolSession) {}
 

package/src/tools/index.ts

@@ -10,6 +10,7 @@ import type { GoalModeState, GoalRuntime } from "../goals";
 import { GoalTool } from "../goals/tools/goal-tool";
 import type { HindsightSessionState } from "../hindsight/state";
 import { LspTool } from "../lsp";
+import type { WorkflowGateEmitter } from "../modes/shared/agent-wire/unattended-session";
 import type { PlanModeState } from "../plan-mode/state";
 import type { AgentRegistry } from "../registry/agent-registry";
 import type { ForkContextSeed, ForkContextSeedOptions } from "../session/agent-session";
@@ -36,9 +37,6 @@ import { DebugTool } from "./debug";
 import { EvalTool } from "./eval";
 import { FindTool } from "./find";
 import { GithubTool } from "./gh";
-import { HindsightRecallTool } from "./hindsight-recall";
-import { HindsightReflectTool } from "./hindsight-reflect";
-import { HindsightRetainTool } from "./hindsight-retain";
 import { InspectImageTool } from "./inspect-image";
 import { IrcTool } from "./irc";
 import { JobTool } from "./job";
@@ -76,9 +74,6 @@ export * from "./debug";
 export * from "./eval";
 export * from "./find";
 export * from "./gh";
-export * from "./hindsight-recall";
-export * from "./hindsight-reflect";
-export * from "./hindsight-retain";
 export * from "./image-gen";
 export * from "./inspect-image";
 export * from "./irc";
@@ -198,6 +193,8 @@ export interface ToolSession {
 	getPlanModeState?: () => PlanModeState | undefined;
 	/** Goal mode state (if active or paused) */
 	getGoalModeState?: () => GoalModeState | undefined;
+	/** Unattended workflow-gate emitter (present only when unattended mode is negotiated). */
+	getWorkflowGateEmitter?: () => WorkflowGateEmitter | undefined;
 	/** Goal runtime for the active agent session. */
 	getGoalRuntime?: () => GoalRuntime | undefined;
 	/** Bridge to the connected client (e.g. ACP editor host). Tools should route fs/terminal/permission requests through this when available. */
@@ -302,7 +299,10 @@ export function computeEssentialBuiltinNames(settings: Settings): string[] {
 
 /**
  * Public callable factory map. External callers may invoke `BUILTIN_TOOLS.read(session)` or
- * `BUILTIN_TOOLS[name](session)` to construct a tool directly.
+ * `BUILTIN_TOOLS[name](session)` to construct a public coding-harness tool directly.
+ *
+ * Hindsight memory helpers are intentionally excluded: memory is a private backend
+ * integration, not a public gajae-code tool surface.
  */
 export const BUILTIN_TOOLS: Record<string, ToolFactory> = {
 	read: s => new ReadTool(s),
@@ -337,9 +337,6 @@ export const BUILTIN_TOOLS: Record<string, ToolFactory> = {
 	web_search: s => new WebSearchTool(s),
 	search_tool_bm25: SearchToolBm25Tool.createIf,
 	write: s => new WriteTool(s),
-	retain: HindsightRetainTool.createIf,
-	recall: HindsightRecallTool.createIf,
-	reflect: HindsightReflectTool.createIf,
 	skill: SkillTool.createIf,
 	goal: s => new GoalTool(s),
 };
@@ -460,11 +457,6 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 		) {
 			requestedTools.push("recipe");
 		}
-		if (session.settings.get("memory.backend") === "hindsight") {
-			for (const name of ["recall", "retain", "reflect"]) {
-				if (!requestedTools.includes(name)) requestedTools.push(name);
-			}
-		}
 	}
 	// Resolve effective tool discovery mode.
 	// tools.discoveryMode takes precedence; mcp.discoveryMode is a back-compat alias for "mcp-only".
@@ -512,9 +504,6 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 			return true;
 		}
 		if (name === "recipe") return session.settings.get("recipe.enabled");
-		if (name === "retain" || name === "recall" || name === "reflect") {
-			return session.settings.get("memory.backend") === "hindsight";
-		}
 		if (name === "task") {
 			const maxDepth = session.settings.get("task.maxRecursionDepth") ?? 2;
 			const currentDepth = session.taskDepth ?? 0;

package/src/tools/read.ts

@@ -1031,7 +1031,7 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 			}
 
 			const collectedLines = streamResult.lines;
-			if (!rawSelector && maxColumns > 0) {
+			if (!rawSelector && !shouldAddHashLines && maxColumns > 0) {
 				for (let i = 0; i < collectedLines.length; i++) {
 					const { text, wasTruncated } = truncateLine(collectedLines[i], maxColumns);
 					if (wasTruncated) {
@@ -1789,8 +1789,9 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 					// counts in `truncation` keep reflecting the source, not the trimmed
 					// view — column truncation surfaces separately via `.limits()`.
 					const rawSelector = isRawSelector(parsed);
+					const shouldAddHashLines = !rawSelector && displayMode.hashLines;
 					const maxColumns = resolveOutputMaxColumns(this.session.settings);
-					if (!rawSelector && maxColumns > 0) {
+					if (!rawSelector && !shouldAddHashLines && maxColumns > 0) {
 						for (let i = 0; i < collectedLines.length; i++) {
 							const { text, wasTruncated } = truncateLine(collectedLines[i], maxColumns);
 							if (wasTruncated) {
@@ -1824,7 +1825,6 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 						getFileReadCache(this.session).recordContiguous(absolutePath, startLineDisplay, collectedLines);
 					}
 
-					const shouldAddHashLines = !rawSelector && displayMode.hashLines;
 					const shouldAddLineNumbers = rawSelector ? false : shouldAddHashLines ? false : displayMode.lineNumbers;
 					let capturedDisplayContent: { text: string; startLine: number } | undefined;
 					const formatText = (text: string, startNum: number): string => {

package/src/tools/skill.ts

@@ -18,6 +18,7 @@
 import type { AgentTool, AgentToolResult } from "@gajae-code/agent-core";
 import { prompt, untilAborted } from "@gajae-code/utils";
 import * as z from "zod/v4";
+import { resolveSubskillActivationForSkillInvocation } from "../extensibility/gjc-plugins";
 import { buildSkillPromptMessage } from "../extensibility/skills";
 import { runNativeStateCommand } from "../gjc-runtime/state-runtime";
 import skillDescription from "../prompts/tools/skill.md" with { type: "text" };
@@ -125,7 +126,18 @@ export class SkillTool implements AgentTool<typeof skillSchema, SkillToolDetails
 			}
 
 			const args = (input.args ?? "").trim();
-			const built = await buildSkillPromptMessage(skill, args);
+			const activationResult = await resolveSubskillActivationForSkillInvocation({
+				cwd: this.#session.cwd,
+				sessionId: this.#session.getSessionId?.() ?? activeState?.session_id?.trim() ?? undefined,
+				skillName: skill.name,
+				args,
+			});
+			const built = await buildSkillPromptMessage(skill, activationResult.cleanedArgs, {
+				subskillActivation: activationResult.activation,
+				subskillActivationSet: activationResult.activeSubskillsToPersist,
+				cwd: this.#session.cwd,
+				sessionId: this.#session.getSessionId?.() ?? activeState?.session_id?.trim() ?? undefined,
+			});
 
 			await sendCustomMessage(
 				{
@@ -141,7 +153,7 @@ export class SkillTool implements AgentTool<typeof skillSchema, SkillToolDetails
 			const summary = JSON.stringify({
 				callee: skill.name,
 				path: skill.filePath,
-				args: args || undefined,
+				args: activationResult.cleanedArgs || undefined,
 				lineCount: built.details.lineCount,
 			});
 			return {
@@ -149,7 +161,7 @@ export class SkillTool implements AgentTool<typeof skillSchema, SkillToolDetails
 				details: {
 					name: skill.name,
 					path: skill.filePath,
-					args: args || undefined,
+					args: activationResult.cleanedArgs || undefined,
 					lineCount: built.details.lineCount,
 				},
 			};

package/src/utils/edit-mode.ts

@@ -1,4 +1,4 @@
-import { $env } from "@gajae-code/utils";
+import { $env } from "@gajae-code/utils/env";
 
 export type EditMode = "replace" | "patch" | "hashline" | "vim" | "apply_patch";