pi-monofold 0.6.0 → 0.6.2

package/README.md

@@ -106,7 +106,7 @@ Example command flows: [docs/examples.md](./docs/examples.md).
 
 Default focus shortcut: `ctrl+shift+m` cycles Active Focus forward through `focusPresets` YAML order. No backward focus shortcut ships in the MVP.
 
-When Active Focus is set, Pi Monofold injects the active preset's `contextFiles` into each agent turn under **Focus Context Injection** and recomposes the manifest so active Workspace Targets are shown first while non-active targets are collapsed to one-line summaries. The MVP uses provisional context-injection caps that are intentionally temporary and exposed as constants for future tuning:
+When Active Focus is set, Pi Monofold injects the active preset's `contextFiles` into each agent turn under **Focus Context Injection** and recomposes the manifest so active Workspace Targets are shown first while non-active targets are collapsed to one-line summaries. Tag-based target inference in `monofold_read`, `monofold_write`, and `monofold_git` also prefers Workspace Targets that belong to the active preset when a tag query would otherwise match multiple candidates; explicit `targetId` / workspace name selectors and uniquely matching targets are unchanged. If multiple in-focus targets still tie, the existing workspace selection flow applies. The MVP uses provisional context-injection caps that are intentionally temporary and exposed as constants for future tuning:
 
 - Max **6** context files per active preset.
 - Max **6,000** characters per file, with `… [truncated]` appended when a file is cut.

package/focus-preset.ts

@@ -184,3 +184,31 @@ export function resetActiveFocusSessionState(): void {
   activeFocusPresetId = null;
   activeFocusInitialized = false;
 }
+
+export type TagBasedTargetInput = {
+  targetTags?: string[];
+  targetId?: string;
+  targetName?: string;
+  workspaceName?: string;
+  workspaceIndex?: number;
+};
+
+/** Returns true when workspace resolution relies on tag query without an explicit selector. */
+export function isTagBasedTargetInference(target: TagBasedTargetInput): boolean {
+  if (!target.targetTags?.length) return false;
+  if (target.targetId) return false;
+  const targetName = target.targetName ?? target.workspaceName;
+  if (targetName) return false;
+  if (target.workspaceIndex !== undefined) return false;
+  return true;
+}
+
+/** Narrows ambiguous tag matches to active-focus targets when at least one in-focus candidate exists. */
+export function biasMatchesTowardActiveFocus<T extends { targetId: string }>(
+  matches: T[],
+  activeTargetIds: ReadonlySet<string>,
+): T[] {
+  if (matches.length <= 1 || activeTargetIds.size === 0) return matches;
+  const inFocus = matches.filter((match) => activeTargetIds.has(match.targetId));
+  return inFocus.length > 0 ? inFocus : matches;
+}

package/index.ts

@@ -12,6 +12,8 @@ import {
   findFocusPresetById,
   getActiveFocusPresetId,
   getActiveFocusPresetPosition,
+  biasMatchesTowardActiveFocus,
+  isTagBasedTargetInference,
   matchesFocusTarget,
   parseFocusPresets,
   setActiveFocusPresetByLabel,
@@ -917,9 +919,20 @@ function notifyNoFocusPresets(ctx: ExtensionContext | ExtensionCommandContext, p
   if (pi) sendCommandOutput(pi, "monofold:focus", message, { focusPresets: 0 });
 }
 
+function biasWorkspaceMatchesWithActiveFocus(loaded: LoadedConfig, matches: ResolvedWorkspace[]): ResolvedWorkspace[] {
+  const activePreset = getActiveFocusPreset(loaded);
+  if (!activePreset) return matches;
+  const activeTargetIds = new Set(getActiveFocusWorkspaces(loaded, activePreset).map(({ workspace }) => workspace.targetId));
+  return biasMatchesTowardActiveFocus(matches, activeTargetIds);
+}
+
 async function resolveWorkspace(ctx: ExtensionContext | ExtensionCommandContext, loaded: LoadedConfig, target: TargetInput): Promise<ResolvedWorkspace> {
-  const matches = loaded.workspaces.filter((workspace) => matchesTarget(workspace, target));
+  ensureActiveFocusInitialized(loaded.raw.focusPresets);
+  let matches = loaded.workspaces.filter((workspace) => matchesTarget(workspace, target));
   if (matches.length === 0) throw new Error(`No workspace matches target: ${JSON.stringify(target)}`);
+  if (matches.length > 1 && isTagBasedTargetInference(target)) {
+    matches = biasWorkspaceMatchesWithActiveFocus(loaded, matches);
+  }
   if (matches.length === 1) return matches[0];
   if (!ctx.hasUI) {
     throw new Error(`Multiple workspaces match target in non-interactive mode: ${matches.map(formatWorkspaceLabel).join(", ")}`);

package/package.json

@@ -11,7 +11,7 @@
   },
   "description": "Pi extension that folds multiple repositories and folders into a guarded virtual monorepo for AI agents.",
   "type": "module",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "pi": {
     "extensions": [
       "./index.ts"