@gmickel/gno 1.22.0 → 1.23.0

package/src/cli/commands/ask.ts

@@ -5,6 +5,7 @@
  * @module src/cli/commands/ask
  */
 
+import type { CliProjectAffinityRequest } from "../../core/project-affinity-surface";
 import type { RetrievalTraceSurfaceMetadata } from "../../core/retrieval-trace-session";
 import type { RetrievalTraceSession } from "../../core/retrieval-trace-session";
 import type {
@@ -15,6 +16,7 @@ import type {
 import type { AskOptions, AskResult, Citation } from "../../pipeline/types";
 
 import { buildVerifiedAsk } from "../../app/verified-ask";
+import { resolveCliProjectAffinity } from "../../core/project-affinity-surface";
 import {
   finishRetrievalTraceAfterError,
   retrievalTraceFilters,
@@ -46,24 +48,25 @@ export { formatAsk } from "./ask-format";
 // Types
 // ─────────────────────────────────────────────────────────────────────────────
 
-export type AskCommandOptions = AskOptions & {
-  /** Override config path */
-  configPath?: string;
-  /** Override embedding model */
-  embedModel?: string;
-  /** Override expansion model */
-  expandModel?: string;
-  /** Override answer generation model */
-  genModel?: string;
-  /** Override rerank model */
-  rerankModel?: string;
-  /** Output as JSON */
-  json?: boolean;
-  /** Output as Markdown */
-  md?: boolean;
-  /** Show all retrieved sources (not just cited) */
-  showSources?: boolean;
-};
+export type AskCommandOptions = Omit<AskOptions, "projectAffinity"> &
+  CliProjectAffinityRequest & {
+    /** Override config path */
+    configPath?: string;
+    /** Override embedding model */
+    embedModel?: string;
+    /** Override expansion model */
+    expandModel?: string;
+    /** Override answer generation model */
+    genModel?: string;
+    /** Override rerank model */
+    rerankModel?: string;
+    /** Output as JSON */
+    json?: boolean;
+    /** Output as Markdown */
+    md?: boolean;
+    /** Show all retrieved sources (not just cited) */
+    showSources?: boolean;
+  };
 
 export type AskCommandResult =
   | {
@@ -108,6 +111,12 @@ export async function ask(
   let traceSession: RetrievalTraceSession | undefined;
 
   try {
+    const { projectAffinityDisabled, projectRoots, ...askOptions } = options;
+    const projectAffinity = await resolveCliProjectAffinity(config, {
+      cwd: process.cwd(),
+      disabled: projectAffinityDisabled,
+      projectRoots,
+    });
     const verificationRequested = options.verify === true;
     const answerRequested =
       verificationRequested || Boolean(options.answer && !options.noAnswer);
@@ -141,7 +150,7 @@ export async function ask(
       store,
       config,
       query,
-      filters: retrievalTraceFilters({ ...options, limit }),
+      filters: retrievalTraceFilters({ ...askOptions, limit }),
       pipeline: "ask",
       indexName: globals.index,
       modelUris: [embedUri, expandUri, answerUri, rerankUri].filter(
@@ -264,7 +273,7 @@ export async function ask(
     if (verificationRequested && answerPort) {
       const verified = await buildVerifiedAsk(
         query,
-        { ...options, limit },
+        { ...askOptions, limit, projectAffinity },
         {
           store,
           config,
@@ -273,6 +282,7 @@ export async function ask(
           embedPort,
           rerankPort,
           genPort: answerPort,
+          projectAffinity,
           traceSession,
         }
       );
@@ -308,6 +318,7 @@ export async function ask(
       noExpand: options.noExpand,
       noRerank: options.noRerank,
       candidateLimit: options.candidateLimit,
+      projectAffinity,
       traceSession,
     });
 

package/src/cli/commands/context-build.ts

@@ -1,6 +1,7 @@
 /** Context Capsule build command over the shared application runtime. */
 
 import type { ContextCapsuleBuildInput } from "../../app/context-runtime";
+import type { CliProjectAffinityRequest } from "../../core/project-affinity-surface";
 import type { RetrievalTraceSession } from "../../core/retrieval-trace-session";
 import type { EmbeddingPort, RerankPort } from "../../llm/types";
 import type { VectorIndexPort } from "../../store/vector";
@@ -11,6 +12,7 @@ import {
   canonicalBuiltContextCapsuleJson,
   validateContextCapsuleBuildInput,
 } from "../../app/context-runtime";
+import { resolveCliProjectAffinity } from "../../core/project-affinity-surface";
 import {
   finishRetrievalTraceAfterError,
   startRetrievalTraceRequest,
@@ -27,10 +29,8 @@ import {
 } from "../progress";
 import { initStore } from "./shared";
 
-export interface ContextBuildCommandOptions extends Omit<
-  ContextCapsuleBuildInput,
-  "goal"
-> {
+export interface ContextBuildCommandOptions
+  extends Omit<ContextCapsuleBuildInput, "goal">, CliProjectAffinityRequest {
   configPath?: string;
   format: "json" | "md";
 }
@@ -64,8 +64,12 @@ export const contextBuild = async (
   goal: string,
   options: ContextBuildCommandOptions
 ): Promise<string> => {
+  const { projectAffinityDisabled, projectRoots, ...contextOptions } = options;
   try {
-    validateContextCapsuleBuildInput({ goal, ...options }, options.indexName);
+    validateContextCapsuleBuildInput(
+      { goal, ...contextOptions },
+      options.indexName
+    );
   } catch (error) {
     throw contextCliError(error);
   }
@@ -84,8 +88,13 @@ export const contextBuild = async (
   let vectorIndex: VectorIndexPort | null = null;
   let traceSession: RetrievalTraceSession | undefined;
   try {
+    const projectAffinity = await resolveCliProjectAffinity(config, {
+      cwd: process.cwd(),
+      disabled: projectAffinityDisabled,
+      projectRoots,
+    });
     validateContextCapsuleBuildInput(
-      { goal, ...options },
+      { goal, ...contextOptions },
       options.indexName,
       config.collections.map((collection) => collection.name)
     );
@@ -163,7 +172,7 @@ export const contextBuild = async (
       if (showProgress && progress) process.stderr.write("\n");
     }
     const capsule = await buildContextCapsule(
-      { goal, ...options },
+      { goal, ...contextOptions },
       {
         store,
         config,
@@ -171,6 +180,7 @@ export const contextBuild = async (
         vectorIndex,
         embedPort,
         rerankPort,
+        projectAffinity,
         traceSession,
       }
     );

package/src/cli/commands/query.ts

@@ -5,6 +5,7 @@
  * @module src/cli/commands/query
  */
 
+import type { CliProjectAffinityRequest } from "../../core/project-affinity-surface";
 import type { RetrievalTraceSurfaceMetadata } from "../../core/retrieval-trace-session";
 import type { RetrievalTraceSession } from "../../core/retrieval-trace-session";
 import type {
@@ -18,6 +19,7 @@ import {
   fingerprintContentTypeRules,
   normalizeContentTypes,
 } from "../../config";
+import { resolveCliProjectAffinity } from "../../core/project-affinity-surface";
 import {
   finishRetrievalTraceAfterError,
   retrievalTraceFilters,
@@ -46,30 +48,31 @@ import { decorateSearchResultsForIndex, initStore } from "./shared";
 // Types
 // ─────────────────────────────────────────────────────────────────────────────
 
-export type QueryCommandOptions = HybridSearchOptions & {
-  /** Override config path */
-  configPath?: string;
-  /** Index name */
-  indexName?: string;
-  /** Override embedding model */
-  embedModel?: string;
-  /** Override expansion model */
-  expandModel?: string;
-  /** Deprecated alias for expansion model */
-  genModel?: string;
-  /** Override rerank model */
-  rerankModel?: string;
-  /** Output as JSON */
-  json?: boolean;
-  /** Output as Markdown */
-  md?: boolean;
-  /** Output as CSV */
-  csv?: boolean;
-  /** Output as XML */
-  xml?: boolean;
-  /** Output files only */
-  files?: boolean;
-};
+export type QueryCommandOptions = Omit<HybridSearchOptions, "projectAffinity"> &
+  CliProjectAffinityRequest & {
+    /** Override config path */
+    configPath?: string;
+    /** Index name */
+    indexName?: string;
+    /** Override embedding model */
+    embedModel?: string;
+    /** Override expansion model */
+    expandModel?: string;
+    /** Deprecated alias for expansion model */
+    genModel?: string;
+    /** Override rerank model */
+    rerankModel?: string;
+    /** Output as JSON */
+    json?: boolean;
+    /** Output as Markdown */
+    md?: boolean;
+    /** Output as CSV */
+    csv?: boolean;
+    /** Output as XML */
+    xml?: boolean;
+    /** Output files only */
+    files?: boolean;
+  };
 
 export interface QueryFormatOptions {
   format: "terminal" | "json" | "files" | "csv" | "md" | "xml";
@@ -86,16 +89,20 @@ export type QueryResult =
     }
   | { success: false; error: string };
 
-export type QueryDiagnoseCommandOptions = HybridSearchOptions & {
-  target: string;
-  configPath?: string;
-  indexName?: string;
-  embedModel?: string;
-  expandModel?: string;
-  genModel?: string;
-  rerankModel?: string;
-  json?: boolean;
-};
+export type QueryDiagnoseCommandOptions = Omit<
+  HybridSearchOptions,
+  "projectAffinity"
+> &
+  CliProjectAffinityRequest & {
+    target: string;
+    configPath?: string;
+    indexName?: string;
+    embedModel?: string;
+    expandModel?: string;
+    genModel?: string;
+    rerankModel?: string;
+    json?: boolean;
+  };
 
 export interface QueryDiagnoseFormatOptions {
   format: "terminal" | "json";
@@ -140,6 +147,12 @@ export async function query(
   let traceSession: RetrievalTraceSession | undefined;
 
   try {
+    const { projectAffinityDisabled, projectRoots, ...queryOptions } = options;
+    const projectAffinity = await resolveCliProjectAffinity(config, {
+      cwd: process.cwd(),
+      disabled: projectAffinityDisabled,
+      projectRoots,
+    });
     const embedUri = resolveModelUri(
       config,
       "embed",
@@ -167,7 +180,7 @@ export async function query(
       store,
       config,
       query: queryText,
-      filters: retrievalTraceFilters({ ...options, limit }),
+      filters: retrievalTraceFilters({ ...queryOptions, limit }),
       pipeline: "hybrid",
       indexName: options.indexName,
       modelUris: [embedUri, expandUri, rerankUri].filter(
@@ -261,8 +274,9 @@ export async function query(
       rerankPort,
     };
     const result = await searchHybrid(deps, queryText, {
-      ...options,
+      ...queryOptions,
       limit,
+      projectAffinity,
       traceSession,
     });
 
@@ -318,6 +332,12 @@ export async function queryDiagnose(
   let rerankPort: RerankPort | null = null;
 
   try {
+    const { projectAffinityDisabled, projectRoots, ...queryOptions } = options;
+    const projectAffinity = await resolveCliProjectAffinity(config, {
+      cwd: process.cwd(),
+      disabled: projectAffinityDisabled,
+      projectRoots,
+    });
     const globals = getGlobals();
     const policy = resolveDownloadPolicy(process.env, {
       offline: globals.offline,
@@ -415,7 +435,8 @@ export async function queryDiagnose(
       rerankPort,
     };
     const result = await diagnoseQueryTarget(deps, queryText, {
-      ...options,
+      ...queryOptions,
+      projectAffinity,
       contentTypeRules,
       contentTypeRulesFingerprint:
         fingerprintContentTypeRules(contentTypeRules),

package/src/cli/commands/search.ts

@@ -5,12 +5,14 @@
  * @module src/cli/commands/search
  */
 
+import type { CliProjectAffinityRequest } from "../../core/project-affinity-surface";
 import type {
   RetrievalTraceSession,
   RetrievalTraceSurfaceMetadata,
 } from "../../core/retrieval-trace-session";
 import type { SearchOptions, SearchResults } from "../../pipeline/types";
 
+import { resolveCliProjectAffinity } from "../../core/project-affinity-surface";
 import {
   finishRetrievalTraceAfterError,
   startRetrievalTraceRequest,
@@ -26,24 +28,25 @@ import { decorateSearchResultsForIndex, initStore } from "./shared";
 // Types
 // ─────────────────────────────────────────────────────────────────────────────
 
-export type SearchCommandOptions = SearchOptions & {
-  /** Override config path */
-  configPath?: string;
-  /** Index name */
-  indexName?: string;
-  /** Output as JSON */
-  json?: boolean;
-  /** Output as Markdown */
-  md?: boolean;
-  /** Output as CSV */
-  csv?: boolean;
-  /** Output as XML */
-  xml?: boolean;
-  /** Output files only */
-  files?: boolean;
-  /** Terminal hyperlink policy */
-  terminalLinks?: FormatOptions["terminalLinks"];
-};
+export type SearchCommandOptions = Omit<SearchOptions, "projectAffinity"> &
+  CliProjectAffinityRequest & {
+    /** Override config path */
+    configPath?: string;
+    /** Index name */
+    indexName?: string;
+    /** Output as JSON */
+    json?: boolean;
+    /** Output as Markdown */
+    md?: boolean;
+    /** Output as CSV */
+    csv?: boolean;
+    /** Output as XML */
+    xml?: boolean;
+    /** Output files only */
+    files?: boolean;
+    /** Terminal hyperlink policy */
+    terminalLinks?: FormatOptions["terminalLinks"];
+  };
 
 export type SearchResult =
   | {
@@ -84,6 +87,12 @@ export async function search(
   let traceSession: RetrievalTraceSession | undefined;
 
   try {
+    const { projectAffinityDisabled, projectRoots, ...searchOptions } = options;
+    const projectAffinity = await resolveCliProjectAffinity(config, {
+      cwd: process.cwd(),
+      disabled: projectAffinityDisabled,
+      projectRoots,
+    });
     const started = await startRetrievalTraceRequest({
       store,
       config,
@@ -109,8 +118,9 @@ export async function search(
     if (!started.ok) return { success: false, error: started.error.message };
     traceSession = started.value ?? undefined;
     const result = await searchBm25(store, query, {
-      ...options,
+      ...searchOptions,
       limit,
+      projectAffinity,
       traceSession,
     });
 

package/src/cli/commands/vsearch.ts

@@ -5,6 +5,7 @@
  * @module src/cli/commands/vsearch
  */
 
+import type { CliProjectAffinityRequest } from "../../core/project-affinity-surface";
 import type {
   RetrievalTraceSession,
   RetrievalTraceSurfaceMetadata,
@@ -12,6 +13,7 @@ import type {
 import type { EmbeddingPort } from "../../llm/types";
 import type { SearchOptions, SearchResults } from "../../pipeline/types";
 
+import { resolveCliProjectAffinity } from "../../core/project-affinity-surface";
 import {
   finishRetrievalTraceAfterError,
   retrievalTraceFilters,
@@ -35,26 +37,27 @@ import { decorateSearchResultsForIndex, initStore } from "./shared";
 // Types
 // ─────────────────────────────────────────────────────────────────────────────
 
-export type VsearchCommandOptions = SearchOptions & {
-  /** Override config path */
-  configPath?: string;
-  /** Index name */
-  indexName?: string;
-  /** Override model URI */
-  model?: string;
-  /** Output as JSON */
-  json?: boolean;
-  /** Output as Markdown */
-  md?: boolean;
-  /** Output as CSV */
-  csv?: boolean;
-  /** Output as XML */
-  xml?: boolean;
-  /** Output files only */
-  files?: boolean;
-  /** Terminal hyperlink policy */
-  terminalLinks?: FormatOptions["terminalLinks"];
-};
+export type VsearchCommandOptions = Omit<SearchOptions, "projectAffinity"> &
+  CliProjectAffinityRequest & {
+    /** Override config path */
+    configPath?: string;
+    /** Index name */
+    indexName?: string;
+    /** Override model URI */
+    model?: string;
+    /** Output as JSON */
+    json?: boolean;
+    /** Output as Markdown */
+    md?: boolean;
+    /** Output as CSV */
+    csv?: boolean;
+    /** Output as XML */
+    xml?: boolean;
+    /** Output files only */
+    files?: boolean;
+    /** Terminal hyperlink policy */
+    terminalLinks?: FormatOptions["terminalLinks"];
+  };
 
 export type VsearchResult =
   | {
@@ -96,6 +99,12 @@ export async function vsearch(
   let traceSession: RetrievalTraceSession | undefined;
 
   try {
+    const { projectAffinityDisabled, projectRoots, ...searchOptions } = options;
+    const projectAffinity = await resolveCliProjectAffinity(config, {
+      cwd: process.cwd(),
+      disabled: projectAffinityDisabled,
+      projectRoots,
+    });
     // Get model URI from preset
     const modelUri = resolveModelUri(
       config,
@@ -107,7 +116,7 @@ export async function vsearch(
       store,
       config,
       query,
-      filters: retrievalTraceFilters({ ...options, limit }),
+      filters: retrievalTraceFilters({ ...searchOptions, limit }),
       pipeline: "vector",
       indexName: options.indexName,
       modelUris: [modelUri],
@@ -152,7 +161,7 @@ export async function vsearch(
       deps,
       query,
       queryEmbedding,
-      { ...options, limit, traceSession }
+      { ...searchOptions, limit, projectAffinity, traceSession }
     );
     if (!result.ok) {
       await traceSession?.finish("failed");

package/src/cli/options.ts

@@ -5,6 +5,10 @@
  * @module src/cli/options
  */
 
+import {
+  normalizeProjectAffinityValues,
+  ProjectAffinityInputError,
+} from "../core/project-affinity-surface";
 import { CliError } from "./errors";
 
 // ─────────────────────────────────────────────────────────────────────────────
@@ -13,6 +17,41 @@ import { CliError } from "./errors";
 
 export type OutputFormat = "terminal" | "json" | "files" | "csv" | "md" | "xml";
 
+export interface CliProjectAffinityOptions {
+  projectAffinityDisabled: boolean;
+  projectRoots: string[];
+}
+
+export const collectRepeatableValue = (
+  value: string,
+  previous: string[] = []
+): string[] => [...previous, value];
+
+export const parseCliProjectAffinityOptions = (
+  options: Record<string, unknown>
+): CliProjectAffinityOptions => {
+  try {
+    const projectRoots = normalizeProjectAffinityValues(
+      Array.isArray(options.projectRoot)
+        ? (options.projectRoot as string[])
+        : undefined,
+      "project roots"
+    );
+    const projectAffinityDisabled = options.projectAffinity === false;
+    if (projectAffinityDisabled && projectRoots.length > 0) {
+      throw new ProjectAffinityInputError(
+        "--no-project-affinity cannot be combined with --project-root"
+      );
+    }
+    return { projectAffinityDisabled, projectRoots };
+  } catch (error) {
+    throw new CliError(
+      "VALIDATION",
+      error instanceof Error ? error.message : "Invalid project affinity input"
+    );
+  }
+};
+
 // ─────────────────────────────────────────────────────────────────────────────
 // Format Support Matrix (per spec/cli.md)
 // ─────────────────────────────────────────────────────────────────────────────