@gajae-code/coding-agent 0.16.7 → 0.17.1

package/src/modes/components/agent-dashboard.ts

@@ -83,6 +83,7 @@ interface AgentDashboardModelContext {
 	modelRegistry?: ModelRegistry;
 	activeModelPattern?: string;
 	defaultModelPattern?: string;
+	credentialSessionId?: string;
 }
 
 export function resolveAgentCreationModel(
@@ -602,7 +603,7 @@ export class AgentDashboard extends Container {
 		if (!modelRegistry) {
 			throw new Error("Model registry unavailable in current session.");
 		}
-		await modelRegistry.refresh();
+		await modelRegistry.refresh("online-if-uncached", this.modelContext.credentialSessionId);
 
 		const settings = this.#settingsManager ?? undefined;
 		const modelPatterns = resolveConfiguredModelPatterns(
@@ -622,6 +623,7 @@ export class AgentDashboard extends Container {
 			modelRegistry,
 			settings,
 			model: selectedModel,
+			credentialSessionId: this.modelContext.credentialSessionId,
 			systemPrompt: [systemPrompt],
 			hasUI: false,
 			notificationHostModeSupported: false,

package/src/modes/components/model-selector.ts

@@ -391,6 +391,7 @@ export class ModelSelectorComponent extends Container {
 	#onCancelCallback = (() => {}) as CancelCallback;
 	#errorMessage?: unknown;
 	#tui: TUI;
+	#renderScope: "full" | "layout";
 	#scopedModels: ReadonlyArray<ScopedModelItem>;
 	#temporaryOnly: boolean;
 	#currentModel?: Model;
@@ -452,6 +453,8 @@ export class ModelSelectorComponent extends Container {
 		onSelect: RoleSelectCallback,
 		onCancel: () => void,
 		options?: {
+			/** Use layout only when mounted outside the viewport-anchor transcript subtree. */
+			renderScope?: "full" | "layout";
 			temporaryOnly?: boolean;
 			initialSearchInput?: string;
 			sessionId?: string;
@@ -473,6 +476,7 @@ export class ModelSelectorComponent extends Container {
 		super();
 
 		this.#tui = tui;
+		this.#renderScope = options?.renderScope ?? "full";
 		this.#settings = settings;
 		this.#modelRegistry = modelRegistry;
 		this.#scopedModels = scopedModels;
@@ -556,7 +560,7 @@ export class ModelSelectorComponent extends Container {
 					this.#clampPresetCursor();
 					void this.#refreshProviderAuth();
 					this.#renderPresetLanding();
-					this.#tui.requestRender();
+					this.#requestRender();
 					return;
 				}
 				if (this.#viewMode === "smart-routing" && this.#smartRoutingPanel) return;
@@ -567,7 +571,7 @@ export class ModelSelectorComponent extends Container {
 					void this.#initializeCatalogView();
 					return;
 				}
-				if (this.#refreshCatalogView()) this.#tui.requestRender();
+				if (this.#refreshCatalogView()) this.#requestRender();
 			});
 		}
 
@@ -588,7 +592,7 @@ export class ModelSelectorComponent extends Container {
 			const panel = this.#smartRoutingPanel;
 			if (!panel) return;
 			panel.updateProviderOrderHint(this.#providerOrderHintFor(panel.getProviderOrder()));
-			this.#tui.requestRender();
+			this.#requestRender();
 		});
 		this.#unsubscribeAuthGeneration =
 			this.#modelRegistry.authStorage?.onGenerationChanged?.(() => {
@@ -606,13 +610,18 @@ export class ModelSelectorComponent extends Container {
 			} else {
 				this.#listContainer.addChild(new Text(theme.fg("muted", "Loading model presets..."), 0, 0));
 			}
-			this.#tui.requestRender();
+			this.#requestRender();
 			void this.#initializePresetLanding();
 		} else {
 			void this.#initializeCatalogView();
 		}
 	}
 
+	#requestRender(): void {
+		if (this.#renderScope === "layout") this.#tui.requestLayoutRender("model-selector");
+		else this.#tui.requestRender();
+	}
+
 	override dispose(): void {
 		if (this.#disposed) return;
 		this.#disposed = true;
@@ -871,7 +880,7 @@ export class ModelSelectorComponent extends Container {
 		} else {
 			// Reload config and cached discovery state without blocking on live provider refresh
 			if (options.refreshRegistry !== false) {
-				await this.#modelRegistry.refresh("offline");
+				await this.#modelRegistry.refresh("offline", this.#authSessionId);
 			}
 
 			// Check for models.json errors
@@ -1054,7 +1063,7 @@ export class ModelSelectorComponent extends Container {
 			// Cache-aware: a fresh discovery cache answers instantly instead of
 			// forcing a provider round-trip (hundreds of ms on remote gateways)
 			// on every provider-tab visit. Stale/missing cache still fetches.
-			await this.#modelRegistry.refreshProvider(providerId, "online-if-uncached");
+			await this.#modelRegistry.refreshProvider(providerId, "online-if-uncached", this.#authSessionId);
 		} catch (error) {
 			refreshError = error;
 		}
@@ -1084,7 +1093,7 @@ export class ModelSelectorComponent extends Container {
 			this.#commitMaterializedCatalog(catalog);
 			this.#updateTabBar();
 			this.#applyTabFilter();
-			this.#tui.requestRender();
+			this.#requestRender();
 		} catch (presentationError) {
 			const finalError =
 				refreshError !== undefined
@@ -1117,7 +1126,7 @@ export class ModelSelectorComponent extends Container {
 			void this.#refreshSelectedProvider().catch(error => {
 				this.#errorMessage = error instanceof Error ? error.message : String(error);
 				this.#updateList();
-				this.#tui.requestRender();
+				this.#requestRender();
 			});
 		};
 		this.#tabBar = tabBar;
@@ -1645,7 +1654,7 @@ export class ModelSelectorComponent extends Container {
 			) {
 				this.#providerAuthPending = false;
 				this.#renderPresetLanding();
-				this.#tui.requestRender();
+				this.#requestRender();
 			}
 		}
 	}
@@ -1739,7 +1748,7 @@ export class ModelSelectorComponent extends Container {
 		}
 		void this.#refreshProviderAuth();
 		this.#renderPresetLanding();
-		this.#tui.requestRender();
+		this.#requestRender();
 	}
 
 	#switchToModelMode(seed?: string, options?: { imageRoleFilter?: boolean }): void {
@@ -1766,7 +1775,7 @@ export class ModelSelectorComponent extends Container {
 		this.#headerContainer.clear();
 		this.#listContainer.clear();
 		this.#listContainer.addChild(new Text(theme.fg("muted", "Loading models..."), 0, 0));
-		this.#tui.requestRender();
+		this.#requestRender();
 
 		const load = this.#loadModels().then(() => {
 			this.#catalogLoaded = true;
@@ -1786,7 +1795,7 @@ export class ModelSelectorComponent extends Container {
 				this.#buildProviderTabs();
 				this.#updateTabBar();
 				this.#updateList();
-				this.#tui.requestRender();
+				this.#requestRender();
 			}
 		} finally {
 			if (this.#catalogLoadPromise === load) this.#catalogLoadPromise = undefined;
@@ -1798,7 +1807,7 @@ export class ModelSelectorComponent extends Container {
 		this.#updateTabBar();
 		// Apply the latest query: input remains responsive while the catalog loads.
 		this.#filterModels(this.#searchInput.getValue());
-		this.#tui.requestRender();
+		this.#requestRender();
 	}
 
 	/**
@@ -1945,7 +1954,7 @@ export class ModelSelectorComponent extends Container {
 		this.#tabBar = null;
 		this.#listContainer.clear();
 		this.#listContainer.addChild(this.#smartRoutingPanel);
-		this.#tui.requestRender();
+		this.#requestRender();
 	}
 
 	#switchToPresetMode(): void {
@@ -1954,7 +1963,7 @@ export class ModelSelectorComponent extends Container {
 		this.#presetCursor = Math.min(this.#presetCursor, Math.max(0, this.#getPresetRows().length - 1));
 		void this.#refreshProviderAuth();
 		this.#renderPresetLanding();
-		this.#tui.requestRender();
+		this.#requestRender();
 	}
 
 	refreshSmartRoutingState(): void {
@@ -1971,7 +1980,7 @@ export class ModelSelectorComponent extends Container {
 			stale: this.#smartRoutingIsStale(),
 			preview,
 		});
-		this.#tui.requestRender();
+		this.#requestRender();
 	}
 
 	#renderPresetLanding(): void {
@@ -2717,7 +2726,7 @@ export class ModelSelectorComponent extends Container {
 			this.#clampPresetCursor();
 		}
 		void this.#refreshProviderAuth();
-		this.#tui.requestRender();
+		this.#requestRender();
 	}
 
 	#beginActionMenuOrSelect(item: ModelItem | CanonicalModelItem): void {
@@ -2930,7 +2939,7 @@ export class ModelSelectorComponent extends Container {
 	async #handleTrackedAssignment(selection: Extract<ModelSelectorSelection, { kind: "assignment" }>): Promise<void> {
 		if (this.#assignmentState !== "idle") return;
 		this.#assignmentState = "assigning";
-		this.#tui.requestRender();
+		this.#requestRender();
 		try {
 			await Promise.resolve(this.#onSelectCallback(selection));
 		} catch {
@@ -2940,7 +2949,7 @@ export class ModelSelectorComponent extends Container {
 			const shouldClose = this.#closeAfterAssignment;
 			this.#closeAfterAssignment = false;
 			if (shouldClose) this.#onCancelCallback();
-			else this.#tui.requestRender();
+			else this.#requestRender();
 		}
 	}
 

package/src/modes/components/plugin-settings.ts

@@ -463,7 +463,8 @@ export class PluginSettingsComponent extends Container {
 
 		this.#viewComponent = new PluginDetailComponent(plugin, this.#manager, {
 			onEnabledChange: async enabled => {
-				await this.#manager.setEnabled(plugin.name, enabled);
+				const state = await this.#manager.getEnablementState(plugin.name, "user");
+				if (state.status === "ok") await this.#manager.setEnabled(plugin.name, enabled, "user", state.baseline);
 				this.callbacks.onPluginChanged();
 			},
 			onFeatureChange: async (feature, enabled) => {

package/src/modes/controllers/selector-controller.ts

@@ -1655,7 +1655,7 @@ export class SelectorController {
 			authStorage: this.ctx.session.modelRegistry.authStorage,
 			trigger: "bare-login",
 		});
-		await this.ctx.session.modelRegistry.refresh();
+		await this.ctx.session.modelRegistry.refresh("online-if-uncached", this.ctx.session.credentialSessionId);
 
 		this.ctx.chatContainer.addChild(new Spacer(1));
 		for (const credential of summary.imported) {
@@ -1690,7 +1690,7 @@ export class SelectorController {
 			const submit = async (input: CustomModelPresetWizardSubmit): Promise<void> => {
 				try {
 					const profile = await this.ctx.session.modelRegistry.saveCustomModelProfile(input.name, input.profile);
-					await this.ctx.session.modelRegistry.refresh("offline");
+					await this.ctx.session.modelRegistry.refresh("offline", this.ctx.session.credentialSessionId);
 					await this.ctx.notifyConfigChanged?.();
 					this.ctx.showStatus(`Custom model preset created: ${formatModelProfileDisplayLabel(profile)}`);
 					done();
@@ -1728,7 +1728,7 @@ export class SelectorController {
 		}
 		try {
 			const renamed = await this.ctx.session.modelRegistry.renameCustomModelProfile(profileName, input);
-			await this.ctx.session.modelRegistry.refresh("offline");
+			await this.ctx.session.modelRegistry.refresh("offline", this.ctx.session.credentialSessionId);
 			await this.ctx.notifyConfigChanged?.();
 			modelSelector.refreshPresetProfiles(renamed.name);
 			this.ctx.showStatus(`Custom model preset renamed: ${formatModelProfileDisplayLabel(renamed)}`);
@@ -1774,7 +1774,7 @@ export class SelectorController {
 				});
 			}
 			deletedProfile = await this.ctx.session.modelRegistry.deleteCustomModelProfile(profileName);
-			await this.ctx.session.modelRegistry.refresh("offline");
+			await this.ctx.session.modelRegistry.refresh("offline", this.ctx.session.credentialSessionId);
 			await this.ctx.notifyConfigChanged?.();
 			refreshSelectorState();
 			this.ctx.showStatus(`Custom model preset deleted: ${profileLabel}`);
@@ -1784,7 +1784,7 @@ export class SelectorController {
 			if (deletedProfile) {
 				try {
 					await this.ctx.session.modelRegistry.saveCustomModelProfile(profileName, deletedProfile);
-					await this.ctx.session.modelRegistry.refresh("offline");
+					await this.ctx.session.modelRegistry.refresh("offline", this.ctx.session.credentialSessionId);
 				} catch (restoreErr) {
 					presetRestoreError = restoreErr;
 				}
@@ -1821,7 +1821,7 @@ export class SelectorController {
 			const submit = async (input: CustomProviderWizardSubmit): Promise<void> => {
 				try {
 					const result = await addApiCompatibleProvider(input);
-					await this.ctx.session.modelRegistry.refresh("offline");
+					await this.ctx.session.modelRegistry.refresh("offline", this.ctx.session.credentialSessionId);
 					await this.ctx.notifyConfigChanged?.();
 					this.ctx.showStatus(formatProviderSetupResult(result));
 					wizard.complete();
@@ -2218,6 +2218,7 @@ export class SelectorController {
 			modelRegistry: this.ctx.session.modelRegistry,
 			activeModelPattern,
 			defaultModelPattern: selectorHead(defaultModelPattern),
+			credentialSessionId: this.ctx.session.credentialSessionId,
 		});
 		this.showSelector(done => {
 			dashboard.onClose = () => {
@@ -2946,6 +2947,8 @@ export class SelectorController {
 				},
 				{
 					...options,
+					// The selector replaces the composer, outside the anchored transcript.
+					renderScope: "layout",
 					sessionId: this.ctx.session.credentialSessionId,
 					currentThinkingLevel: this.ctx.session.thinkingLevel,
 					activeModelProfile:
@@ -3626,7 +3629,7 @@ export class SelectorController {
 				},
 				{ manualCode },
 			);
-			await this.ctx.session.modelRegistry.refresh();
+			await this.ctx.session.modelRegistry.refresh("online-if-uncached", this.ctx.session.credentialSessionId);
 			this.ctx.chatContainer.addChild(new Spacer(1));
 			const successMessage =
 				providerId === "opencodex"
@@ -3679,7 +3682,7 @@ export class SelectorController {
 				return;
 			}
 			await clearPersistentPinForRemovedRows(this.ctx.settings, providerId, inventory, result.ids);
-			await this.ctx.session.modelRegistry.refresh();
+			await this.ctx.session.modelRegistry.refresh("online-if-uncached", this.ctx.session.credentialSessionId);
 			this.ctx.showStatus(
 				`Successfully removed ${result.ids.length} stored credential${result.ids.length === 1 ? "" : "s"} from ${providerId}.`,
 			);
@@ -3890,7 +3893,10 @@ export class SelectorController {
 									}
 									if (summary.imported.length > 0) {
 										try {
-											await this.ctx.session.modelRegistry.refresh("offline");
+											await this.ctx.session.modelRegistry.refresh(
+												"offline",
+												this.ctx.session.credentialSessionId,
+											);
 										} catch {
 											logger.warn("Credential auto-import refresh failed", {
 												classification: "refresh-failed",

package/src/modes/interactive-mode.ts

@@ -45,7 +45,12 @@ import {
 	starReminderLaunchGate,
 } from "../reminders/star-reminder";
 import type { NotificationSessionReconcileResult, NotificationSessionStatus } from "../sdk/bus/session-control";
-import type { AgentSession, AgentSessionEvent, AsyncJobSnapshotItem } from "../session/agent-session";
+import {
+	type AgentSession,
+	type AgentSessionEvent,
+	type AsyncJobSnapshotItem,
+	isSessionDisposalIncompleteError,
+} from "../session/agent-session";
 import type { HistoryStorage } from "../session/history-storage";
 import type { SessionContext, SessionManager } from "../session/session-manager";
 import { getRecentSessions, getSessionMessageEntryId } from "../session/session-manager";
@@ -1791,7 +1796,17 @@ export class InteractiveMode implements InteractiveModeContext {
 
 		// Emit shutdown event to hooks
 		this.session.setSdkPlanModeHandler(null);
-		await this.session.dispose();
+		let disposalWarning: string | undefined;
+		try {
+			await this.session.dispose();
+		} catch (error) {
+			if (!isSessionDisposalIncompleteError(error)) throw error;
+			// The caller deadline does not cancel the underlying persistence drain.
+			// Own this expected failure here so /exit still restores the terminal and
+			// enters bounded cleanup, rather than the unhandled-rejection crash path.
+			disposalWarning = sanitizeText(error.message);
+			logger.warn("Interactive shutdown persistence remains incomplete", { error: error.message });
+		}
 
 		if (this.isInitialized) {
 			this.ui.requestRender(true);
@@ -1808,6 +1823,9 @@ export class InteractiveMode implements InteractiveModeContext {
 		await this.petWidget?.disposeAsync();
 		await this.#itermPetTransport?.dispose();
 		this.stop();
+		if (disposalWarning) {
+			process.stderr.write(`\nShutdown incomplete: ${disposalWarning}\nPending state may not be saved.\n`);
+		}
 
 		// Print resumption hint if this is a persisted session
 		const sessionId = this.sessionManager.getSessionId();
@@ -1818,7 +1836,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			);
 		}
 
-		await postmortem.quit(0);
+		await postmortem.quit(disposalWarning ? 1 : 0);
 	}
 
 	async checkShutdownRequested(): Promise<void> {

package/src/prompts/system/system-prompt.md

@@ -30,7 +30,11 @@ Optimize for correctness first, maintainability second, and brevity third. Prefe
 - Clear work with demonstrated architecture or sequencing risk suggests `/skill:ralplan --deliberate`; reconciliation must persist its final receipt before choosing approval or an admitted handoff. A valid non-off final runtime receipt enters the existing handoff chain; otherwise it stops pending approval.
 - Use `/skill:ultragoal` for durable goal ledgers and `/skill:autoresearch` for goal-directed research missions that end on a structured verdict rather than an implementation.
 - Delegate large implementation slices to `executor`; use `planner`, `architect`, or `critic` for bounded planning and review.
-- An explicit user request to use a worktree (for example, "use worktree") overrides direct editing: delegate implementation through `task` with `isolated: true`. This is the in-session counterpart of launching `gjc --worktree`; if task isolation is unavailable, report that conflict instead of editing in the parent session.
+{{#if taskIsolationEnabled}}
+- An explicit user request to use a worktree (for example, "use worktree") overrides direct editing: delegate implementation through `task` with `isolated: true`. This is the in-session counterpart of launching `gjc --worktree`; if a specific task cannot be delegated that way, create or select a dedicated git worktree with `git worktree add` and implement there instead of editing the parent checkout.
+{{else}}
+- An explicit user request to use a worktree (for example, "use worktree") overrides direct editing of the current checkout: create or select a dedicated git worktree with `git worktree add` and implement there. Task-level isolation is off in this session, so `task` does NOT accept `isolated`; NEVER refuse worktree work over that missing parameter. Mention the `task.isolation.mode` setting only if the user explicitly wants subagent-level isolation.
+{{/if}}
 - Active skills are authoritative: never ignore an invoked skill; read the full skill text and follow it exactly.
 - Before explicit execution approval or a valid non-off ralplan final runtime receipt, planning and interview workflows NEVER edit product source, run mutating shell commands, commit, push, open PRs, or delegate implementation.
 </routing>

package/src/prompts/tools/browser.md

@@ -10,7 +10,7 @@ Drives a real Chromium tab with full puppeteer access via JS execution.
 - Tabs survive across `run` calls and across in-process subagents. Open once, reuse many times.
 - Browser kinds: no `app` launches headless Chromium; `app.path` reuses CDP or kills stale same-path processes before spawning — NEVER use it for a daily Chrome profile; use explicit `app.browser: "chrome"` profile mode instead. In profile mode, `path` defaults to installed Chrome/Chromium and `profile_directory` defaults to `"Default"`, but `user_data_dir` must name a separate non-default Chrome data directory: Chrome 136+ disables remote debugging for its default data directory. Only Chrome/Chromium executables are admitted; Edge, Brave, Vivaldi, Opera, unknown browser brands, and default Chrome data roots are rejected. Use `app.cdp_url` to attach to an already-authorized browser. Saved-profile/CDP automation has access to that profile's cookies and authenticated accounts. Profile mode refuses a matching non-CDP Chrome instead of killing/relaunching it, and `kill: true` can terminate only a Chrome process GJC launched; `app.cdp_url` is externally owned and disconnect-only. CDP must stay on `127.0.0.1`: it grants full browser-account access.
 - Inside `run`, `tab` exposes high-level helpers (`goto`, `observe`, `id`, `click`, `type`, `fill`, `press`, `waitFor`, `screenshot`, `extract`, …); reach for `page` (raw puppeteer Page) when they don't cover it.
-- Selectors accept CSS as well as puppeteer query handlers: `aria/Sign in`, `text/Continue`, `xpath/…`, `pierce/…`.
+- Selectors must be non-empty strings: CSS or puppeteer query handlers (`aria/Sign in`, `text/Continue`, `xpath/…`, `pierce/…`). In `run`, click numeric observation ids with `(await tab.id(58)).click()`, not `tab.click(58)`. Omit optional selectors for unfocused `tab.press()` or page-level `tab.screenshot()`; null and blank selectors are invalid.
 - Runtime diagnostics are opt-in: pass `diagnostics: true` to `open` to subscribe the tab to page `Runtime.exceptionThrown` and `console.error` events. The next successful `act`/`run` response then includes at most 20 `runtimeDiagnostics` entries plus `runtimeDiagnosticsDropped`, then drains them. Entries contain only kind, time, origin-only URL, line/column, and a built-in error class from a fixed allowlist — never path segments, query strings, messages, console arguments, values, or stacks. Output is byte-bounded and marks truncation explicitly.
 - Full reference — helpers, browser kinds, CDP/security details, and more examples — read `gjc://tools/browser.md`.
 </instruction>

package/src/prompts/tools/move-session.md

@@ -13,3 +13,7 @@ cwd from the new directory, and project-scoped plugins/capabilities reload for i
   speculatively — because the session file and caches move with the session.
 - This tool is unavailable in subagent sessions and restricted profiles; ask the top-level
   session to rescope instead.
+- For an explicitly requested sibling or unrelated repository, start a new session with
+  `gjc --cwd <approved-worktree>` and delegate from there. A task's `repositoryBinding`
+  verifies the session's repository; it cannot authorize relocation. Already-created task
+  tools retain their original repository binding even after a user-driven cwd move.

package/src/prompts/tools/read.md

@@ -9,7 +9,7 @@ Read files, directories, archives, SQLite databases, images, documents, internal
 ## Parameters
 
 - `path` — required. Local path, internal URI (`agent://`, `artifact://`, `rule://`, `local://`), or URL. Append `:<sel>` for line ranges, raw mode, or special modes (e.g. `src/foo.ts:50-200`, `src/foo.ts:raw`, `db.sqlite:users:42`).
-- `truncation` — optional `head` | `last` | `both`; selects which end of an over-budget result to retain. Configured default: {{TRUNCATION_DEFAULT}} (factory default: `last`); non-file routes such as URLs, directories and converted documents default to `head`. A line-range selector still bounds the selection — this only picks which end of that selection survives the byte/line cap. SQLite row queries page via their own `limit`/`offset` and ignore it.
+- `truncation` — optional `head` | `last` | `both`; selects which end of an over-budget result to retain. Configured default: {{TRUNCATION_DEFAULT}} (factory default: `last`); structural summaries and routes such as URLs, directories and converted documents default to `head`. A line-range selector still bounds the selection — this only picks which end of that selection survives the byte/line cap. SQLite row queries page via their own `limit`/`offset` and ignore it.
 ## Selectors
 Append `:<sel>` to `path`. The bare path falls back to the default mode.
 
@@ -38,6 +38,7 @@ Append `:<sel>` to `path`. The bare path falls back to the default mode.
   `[NN lines across MM elided regions; read <path>:raw or a line range like <path>:1-9999 for verbatim content]`
 
   If the elided body is what you actually need, re-issue the **exact selector the footer names**. NEVER guess what's inside `..` / `…` — those markers carry no content.
+- Structural summaries honor explicit `truncation`: `head` retains the beginning, `last` the end, and `both` both ends within the summary byte budget. Complete summary units and their original source anchors stay intact and in source order; budget omissions are marked where they occur. This does not switch to raw source. Summaries that fit are unchanged by direction.
 - Directional windows identify the retained first/last lines and the omitted range; use the `re-read <path>:1-<total>` or `:raw` hint in the footer to recover the full content.
 
 # Documents & Notebooks

package/src/prompts/tools/skill-discovery.md

@@ -1,15 +1,16 @@
-Discover project and user runtime skills without loading full skill content.
+Discover bundled GJC workflow, project, and user runtime skills without loading full skill content.
 
 <instruction>
-- Searches canonical GJC skill locations in precedence order: project `.gjc/skills` (ancestors from cwd to repo root, closest first), then user locations under the home directory: canonical `<config>/agent/skills`, configured legacy `<config>/skills`, and historical legacy `.gjc/skills`. `<config>` is the home-relative directory name from `GJC_CONFIG_DIR`, then `PI_CONFIG_DIR`, then `.gjc`; even an absolute-looking configured name is joined beneath `<home>`. Project scope shadows user scope; within a scope, earlier locations above win. Bundled GJC workflow skills (`autoresearch`, `deep-interview`, `ralplan`, `ultragoal`) are always available and cannot be replaced by filesystem skills.
-- Returns thin metadata only: name, description, source scope, path, and use conditions when present.
+- Includes the four bundled GJC workflow skills (`autoresearch`, `deep-interview`, `ralplan`, `ultragoal`) as `source: "bundled"` candidates from the generated bundled catalog; they are always available, cannot be replaced by filesystem copies, and are included for `source: "all"` but excluded by explicit `source: "project"`/`"user"` requests.
+- Returns thin metadata only: name, description, source scope, path, and use conditions when present. Bundled paths are stable catalog identifiers, not filesystem paths.
+- In trusted Git projects, `.gjc/skills` may be a symlink to a directory inside the same repository (for example `../.agents/skills`). Link and target identities remain checked through body loading; external targets and symlinked user/profile roots are refused. Do not replace a safe project link with copied files to make discovery work.
 - Claude Code (`.claude/skills`) and Codex (`.codex/skills`) layouts are explicit import sources into `.gjc`, never invokable candidates. They are not returned as candidates; instead, each convention skill found in a trusted scope is reported in `diagnostics` with the exact copy command that enables it (copy into `.gjc/skills`), so a skill placed in a documented convention location is discoverable in a normal session without being silently loaded.
-- Discovery is on by default in a normal session. When zero candidates are returned because discovery config is disabled (`skills.enabled` master switch, or `skills.trustProjectSkills` / `skills.trustUserSkills` scope trust), the result carries a `notice` explaining which setting blocked the search — an empty result without a `notice` means the searched scopes genuinely contain no matching skills.
+- Discovery is on by default in a normal session. `query` matching is conjunctive substring: every whitespace-separated term must appear in a skill's name, description, source, or use conditions, unless a term equals the exact skill name — one keyword that appears nowhere in the candidate's metadata drops every candidate, so query with exact names or few terms known to appear literally, not topic keyword lists. When zero candidates are returned, the result carries a `notice` if discovery config disabled a requested scope, a non-empty query filtered out scanned skills, or diagnostics explain observed skills that were skipped or filtered. Only an empty result without a `notice` means no skills were scanned and no diagnostics were produced; never report a zero-candidate result as proof no skill exists.
 - When skills were scanned but not advertised (protected-name collision with a bundled workflow skill, include/ignore/disable policy filters, invalid frontmatter, shadowing), the result carries a bounded `diagnostics` list explaining why.
 - To load a selected skill's full `SKILL.md`, invoke it through the existing `skill` tool with the exact `name` returned here.
 </instruction>
 
 Input:
-- `query` (optional): words to match against skill name, description, source, or use conditions.
+- `query` (optional): words to match against skill name, description, source, or use conditions. Every term must appear (conjunctive substring), or one term must equal the exact skill name.
 - `source` (optional): `all`, `project`, or `user`.
 - `limit` (optional): maximum results, 1-50.

package/src/prompts/tools/task.md

@@ -29,6 +29,7 @@ Subagents have no conversation history. Every fact, file path, and direction the
 {{#if customSchemaEnabled}}- `schema`: JTD schema for expected structured output (do not put format rules in assignments){{/if}}
 - `spawnPlan` (optional): required before any batch with more than 4 tasks; include whyParallel, whyNotLocal, independence, expectedReceiptShape, and maxInlineTokens.
 {{#if isolationEnabled}}- `isolated`: run in an isolated environment; REQUIRED when the user explicitly requests a worktree (for example, "use worktree"), and use when tasks edit overlapping files{{/if}}
+- `repositoryBinding`: optional authoritative repository/worktree identity. It must match the active session and cannot authorize a foreign repository from this session. For another approved repository, start a fresh session rooted there (for example, `gjc --cwd <approved-worktree>`); do not use `/move` because materialized tasks retain their original binding.
 </parameters>
 
 <rules>