@grepr/cli 1.8.16-07685b7 → 1.9.0-98ae3f0

package/build/dist/commands/backfill-command.d.ts

@@ -5,6 +5,7 @@ import type { CliOptions, MergeConfiguration } from '../types.js';
 interface BackfillCommandOptions extends CliOptions, BackfillCommandInputs {
     dryRun?: boolean;
     output?: string;
+    sqlOperationPath?: string;
 }
 export declare class BackfillCommand implements ICommand {
     getCommandName(): string;

package/build/dist/commands/backfill-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backfill-command.d.ts","sourceRoot":"","sources":["../../../src/main/typescript/commands/backfill-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGzC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAM3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAGhE,OAAO,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGlE,UAAU,sBAAuB,SAAQ,UAAU,EAAE,qBAAqB;IACxE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AA0BD,qBAAa,eAAgB,YAAW,QAAQ;IAC9C,cAAc,IAAI,MAAM;IAIxB,qBAAqB,IAAI,MAAM;IAI/B,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAgCtE,OAAO,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;YAkD/C,UAAU;CAezB"}
+{"version":3,"file":"backfill-command.d.ts","sourceRoot":"","sources":["../../../src/main/typescript/commands/backfill-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGzC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAO3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAGhE,OAAO,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAQlE,UAAU,sBAAuB,SAAQ,UAAU,EAAE,qBAAqB;IACxE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AA8BD,qBAAa,eAAgB,YAAW,QAAQ;IAC9C,cAAc,IAAI,MAAM;IAIxB,qBAAqB,IAAI,MAAM;IAI/B,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IA2CtE,OAAO,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;YA6D/C,UAAU;CAezB"}

package/build/dist/commands/backfill-command.js

@@ -1,14 +1,17 @@
-import { mkdir, writeFile } from 'fs/promises';
+import { mkdir, readFile, writeFile } from 'fs/promises';
 import { dirname } from 'path';
 import { createApiClient } from '../lib/api-client-factory.js';
-import { buildBackfillRequest, resolveBackfillInputs } from '../lib/backfill.js';
+import { buildBackfillRequest, resolveBackfillInputs, validateSpansSqlOperation } from '../lib/backfill.js';
 import { buildBackfillGreprUrl } from '../lib/backfill-grepr-link.js';
 import { buildBackfillVendorLinks } from '../lib/backfill-vendor-links.js';
+import { parseSignalDataType } from '../lib/signal-source.js';
 function normalizeBackfillOptions(options) {
+    const { sqlOperation, ...rest } = options;
     return {
-        ...options,
+        ...rest,
         sinkIds: options.sinkIds ?? options.sinkId,
-        tags: options.tags ?? options.tag
+        tags: options.tags ?? options.tag,
+        sqlOperationPath: sqlOperation
     };
 }
 function parseBackfillLimitArg(value) {
@@ -26,22 +29,25 @@ export class BackfillCommand {
         return 'backfill';
     }
     getCommandDescription() {
-        return 'Create a manual logs backfill job';
+        return 'Create a manual logs or spans backfill job';
     }
     addToProgram(program, mergeConfiguration) {
         program
             .command(this.getCommandName())
             .description(this.getCommandDescription())
             .option('--job-id <id>', 'Source pipeline/job ID')
-            .option('--dataset-id <id>', 'Raw logs dataset ID')
-            .option('--dataset-name <name>', 'Raw logs dataset name')
+            .option('--dataset-id <id>', 'Raw dataset ID')
+            .option('--dataset-name <name>', 'Raw dataset name')
+            .option('--data-type <type>', 'Data type (logs or spans; explicit datasets default to logs)', parseSignalDataType)
             .option('--sink-id <ids...>', 'Destination observability integration IDs')
             .option('--start <timestamp>', 'Backfill start timestamp (ISO 8601)')
             .option('--end <timestamp>', 'Backfill end timestamp (ISO 8601)')
-            .option('--query <query>', 'Log query string', '')
+            .option('--query <query>', 'Query string', '')
             .option('--query-type <type>', 'Query type', 'datadog-query')
-            .option('--limit <number>', 'Maximum number of records to backfill (-1 for no limit)', parseBackfillLimitArg, 10000)
+            .option('--limit <number>', 'Maximum records to backfill (per vendor source for spans; -1 for no limit)', parseBackfillLimitArg, 10000)
             .option('--tag <key:value...>', 'Vendor-visible tags or attributes')
+            .option('--sql-operation <file>', 'Span SQL operation JSON file')
+            .option('--preserve-sql', 'Preserve post-reducer SQL from a source trace pipeline')
             .option('--dry-run', 'Print the generated job JSON and do not submit')
             .option('--output <file>', 'Write dry-run JSON or created job response')
             .action(async (options, command) => {
@@ -54,16 +60,21 @@ export class BackfillCommand {
                 });
             }
             catch (error) {
-                const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-                console.error(`Error executing ${this.getCommandName()}:`, errorMessage);
+                console.error(`Error executing ${this.getCommandName()}:`, errorMessage(error));
                 process.exit(1);
             }
         });
     }
     async execute(options) {
         const apiClient = createApiClient(options);
-        const resolved = await resolveBackfillInputs(options, apiClient);
-        const request = buildBackfillRequest(options, resolved);
+        const inputs = {
+            ...options,
+            ...(options.sqlOperationPath
+                ? { sqlOperation: await loadSqlOperation(options.sqlOperationPath) }
+                : {})
+        };
+        const resolved = await resolveBackfillInputs(inputs, apiClient);
+        const request = buildBackfillRequest(inputs, resolved);
         if (!options.quiet) {
             resolved.skippedSinks.forEach(({ sink, reason }) => {
                 console.warn(`Warning: Skipping ${sink.name} (${sink.id}): ${reason}.`);
@@ -78,7 +89,8 @@ export class BackfillCommand {
         }
         const createdJob = await apiClient.createBackfillJob(request);
         if (!createdJob) {
-            throw new Error('Backfill job creation returned no job');
+            throw new Error('The backfill request succeeded but returned no job. The backfill may be running: ' +
+                'check `grepr job:list` before retrying, to avoid submitting it twice.');
         }
         try {
             const vendorLinks = buildBackfillVendorLinks(request, resolved.sinks);
@@ -93,8 +105,8 @@ export class BackfillCommand {
         catch (error) {
             const outputPath = options.output;
             if (outputPath) {
-                const errorMessage = error instanceof Error ? error.message : String(error);
-                throw new Error(`Backfill job ${createdJob.id ?? '<unknown id>'} was created, but writing output to ${outputPath} failed: ${errorMessage}`);
+                throw new Error(`Backfill job ${createdJob.id ?? '<unknown id>'} was created, but writing output ` +
+                    `to ${outputPath} failed: ${errorMessage(error)}`);
             }
             throw error;
         }
@@ -112,4 +124,25 @@ export class BackfillCommand {
         console.log(json);
     }
 }
+async function loadSqlOperation(path) {
+    let contents;
+    try {
+        contents = await readFile(path, 'utf8');
+    }
+    catch (error) {
+        throw new Error(`Could not read --sql-operation ${path}: ${errorMessage(error)}`);
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(contents);
+    }
+    catch (error) {
+        throw new Error(`Invalid JSON in --sql-operation ${path}: ${errorMessage(error)}`);
+    }
+    validateSpansSqlOperation(parsed);
+    return parsed;
+}
+function errorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}
 //# sourceMappingURL=backfill-command.js.map

package/build/dist/commands/backfill-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"backfill-command.js","sourceRoot":"","sources":["../../../src/main/typescript/commands/backfill-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"backfill-command.js","sourceRoot":"","sources":["../../../src/main/typescript/commands/backfill-command.ts"],"names":[],"mappings":"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"}

package/build/dist/commands/base-command.d.ts

@@ -1,13 +1,10 @@
-import { GreprApiClient } from '../lib/api-client.js';
 import { FormattableCommandOptions } from '../types.js';
 import { SchemaCreateJob } from '../openapi/openApiTypes.js';
 export declare abstract class BaseCommand<T extends FormattableCommandOptions> {
     private streamingExecutor;
-    protected apiClient: GreprApiClient | null;
     constructor();
     abstract execute(options: T): Promise<void>;
     protected processJobStream(jobDefinition: SchemaCreateJob, options: T): Promise<void>;
-    protected initializeComponents(options: T): void;
-    protected handleError(error: Error, context?: string): void;
+    protected handleError(error: unknown, context?: string): never;
 }
 //# sourceMappingURL=base-command.d.ts.map

package/build/dist/commands/base-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../../../src/main/typescript/commands/base-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,8BAAsB,WAAW,CAAC,CAAC,SAAS,yBAAyB;IACnE,OAAO,CAAC,iBAAiB,CAAuB;IAChD,SAAS,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI,CAAQ;;IAMlD,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;cAE3B,gBAAgB,CAAC,aAAa,EAAE,eAAe,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3F,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI;IAMhD,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,SAAK,GAAG,IAAI;CAKxD"}
+{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../../../src/main/typescript/commands/base-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,8BAAsB,WAAW,CAAC,CAAC,SAAS,yBAAyB;IACnE,OAAO,CAAC,iBAAiB,CAAuB;;IAMhD,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;cAE3B,gBAAgB,CAAC,aAAa,EAAE,eAAe,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3F,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,SAAK,GAAG,KAAK;CAK3D"}

package/build/dist/commands/base-command.js

@@ -1,21 +1,15 @@
 import { StreamingJobExecutor } from '../lib/streaming-job-executor.js';
 export class BaseCommand {
     streamingExecutor;
-    apiClient = null;
     constructor() {
         this.streamingExecutor = new StreamingJobExecutor();
     }
     async processJobStream(jobDefinition, options) {
         await this.streamingExecutor.execute(jobDefinition, options);
     }
-    initializeComponents(options) {
-        // For backward compatibility, create the API client here
-        // The streaming executor will create its own client as needed
-        this.apiClient = this.streamingExecutor.createApiClient(options);
-    }
     handleError(error, context = '') {
-        const errorMsg = context ? `${context}: ${error.message}` : error.message;
-        console.error(`[ERROR] ${errorMsg}`);
+        const message = error instanceof Error ? error.message : String(error);
+        console.error(`[ERROR] ${context ? `${context}: ${message}` : message}`);
         process.exit(1);
     }
 }

package/build/dist/commands/base-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../../src/main/typescript/commands/base-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAKxE,MAAM,OAAgB,WAAW;IACvB,iBAAiB,CAAuB;IACtC,SAAS,GAA0B,IAAI,CAAC;IAElD;QACE,IAAI,CAAC,iBAAiB,GAAG,IAAI,oBAAoB,EAAE,CAAC;IACtD,CAAC;IAIS,KAAK,CAAC,gBAAgB,CAAC,aAA8B,EAAE,OAAU;QACzE,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;IAES,oBAAoB,CAAC,OAAU;QACvC,yDAAyD;QACzD,8DAA8D;QAC9D,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IACnE,CAAC;IAES,WAAW,CAAC,KAAY,EAAE,OAAO,GAAG,EAAE;QAC9C,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;QAC1E,OAAO,CAAC,KAAK,CAAC,WAAW,QAAQ,EAAE,CAAC,CAAC;QACrC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;CACF"}
+{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../../src/main/typescript/commands/base-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAIxE,MAAM,OAAgB,WAAW;IACvB,iBAAiB,CAAuB;IAEhD;QACE,IAAI,CAAC,iBAAiB,GAAG,IAAI,oBAAoB,EAAE,CAAC;IACtD,CAAC;IAIS,KAAK,CAAC,gBAAgB,CAAC,aAA8B,EAAE,OAAU;QACzE,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;IAES,WAAW,CAAC,KAAc,EAAE,OAAO,GAAG,EAAE;QAChD,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,OAAO,CAAC,KAAK,CAAC,WAAW,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,KAAK,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACzE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;CACF"}

package/build/dist/commands/query-command.d.ts

@@ -2,15 +2,17 @@ import type { Command } from 'commander';
 import { BaseCommand } from './base-command.js';
 import type { ICommand } from '../lib/command-registry.js';
 import { type CommandOption, type MergeConfiguration, type QueryCommandOptions } from '../types.js';
-export { buildLanguageQueryPredicate, buildMessageLengthPredicate, buildSourcePredicate } from '../lib/query-predicate.js';
+import { type SchemaCreateJob } from '../openapi/openApiTypes.js';
+import { buildLanguageQueryPredicate, buildMessageLengthPredicate, buildSignalPredicate, buildSourcePredicate } from '../lib/query-predicate.js';
+import { type ResolvedSignalSource } from '../lib/signal-source.js';
+export { buildLanguageQueryPredicate, buildMessageLengthPredicate, buildSignalPredicate, buildSourcePredicate };
+export declare function validateQueryOptions(options: QueryCommandOptions): void;
+export declare function buildQueryJobDefinition(options: QueryCommandOptions, resolved: ResolvedSignalSource, now?: Date): SchemaCreateJob;
 export declare class QueryCommand extends BaseCommand<QueryCommandOptions> implements ICommand {
     getCommandName(): string;
     getCommandDescription(): string;
     getCommandOptions(): CommandOption[];
     addToProgram(program: Command, mergeConfiguration: MergeConfiguration): void;
     execute(options: QueryCommandOptions): Promise<void>;
-    private validateQueryOptions;
-    private resolveDatasetId;
-    private createJobDefinition;
 }
 //# sourceMappingURL=query-command.d.ts.map

package/build/dist/commands/query-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-command.d.ts","sourceRoot":"","sources":["../../../src/main/typescript/commands/query-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAG1D,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACzB,MAAM,aAAa,CAAA;AAWpB,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,EAC3B,oBAAoB,EACrB,MAAM,2BAA2B,CAAA;AAElC,qBAAa,YAAa,SAAQ,WAAW,CAAC,mBAAmB,CAAE,YAAW,QAAQ;IAEpF,cAAc,IAAI,MAAM;IAIxB,qBAAqB,IAAI,MAAM;IAI/B,iBAAiB,IAAI,aAAa,EAAE;IAqDpC,YAAY,CACV,OAAO,EAAE,OAAO,EAChB,kBAAkB,EAAE,kBAAkB,GACrC,IAAI;IA2CD,OAAO,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB1D,OAAO,CAAC,oBAAoB;YAcd,gBAAgB;YAgChB,mBAAmB;CAqClC"}
+{"version":3,"file":"query-command.d.ts","sourceRoot":"","sources":["../../../src/main/typescript/commands/query-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAI3D,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACzB,MAAM,aAAa,CAAC;AACrB,OAAO,EAUL,KAAK,eAAe,EAQrB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,EAC3B,oBAAoB,EACpB,oBAAoB,EAGrB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAIL,KAAK,oBAAoB,EAC1B,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,EAC3B,oBAAoB,EACpB,oBAAoB,EACrB,CAAC;AAEF,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,CAUvE;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,mBAAmB,EAC5B,QAAQ,EAAE,oBAAoB,EAC9B,GAAG,OAAa,GACf,eAAe,CA6BjB;AA+DD,qBAAa,YAAa,SAAQ,WAAW,CAAC,mBAAmB,CAAE,YAAW,QAAQ;IACpF,cAAc,IAAI,MAAM;IAIxB,qBAAqB,IAAI,MAAM;IAI/B,iBAAiB,IAAI,aAAa,EAAE;IA4DpC,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAgDtE,OAAO,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;CAoB3D"}

package/build/dist/commands/query-command.js

@@ -1,19 +1,100 @@
 import { BaseCommand } from './base-command.js';
+import { createApiClient } from '../lib/api-client-factory.js';
 import { parseIntArg } from '../lib/option-parsers.js';
 import { validateOptionalTimestampRange } from '../lib/time-utils.js';
 import { JobExecution, JobProcessing } from '../types.js';
-import { GreprLlmPromptResultsSourceSortOrder, GreprRawLogsSourceType, LogsIcebergTableSourceType, LogsSynchronousSinkType } from '../openapi/openApiTypes.js';
-import { buildSourcePredicate } from '../lib/query-predicate.js';
-export { buildLanguageQueryPredicate, buildMessageLengthPredicate, buildSourcePredicate } from '../lib/query-predicate.js';
+import { CreateLogsBackfillJobDataType, CreateSpansBackfillJobDataType, GreprLlmPromptResultsSourceSortOrder, GreprRawLogsSourceType, GreprRawSpanSourceType, LogsIcebergTableSourceType, LogsSynchronousSinkType, SpansSynchronousSinkType, TracesIcebergTableSourceType } from '../openapi/openApiTypes.js';
+import { buildLanguageQueryPredicate, buildMessageLengthPredicate, buildSignalPredicate, buildSourcePredicate, warnOnUnliftedSpanQuery } from '../lib/query-predicate.js';
+import { parseSignalDataType, resolveSignalSource, validateSignalSourceInputs } from '../lib/signal-source.js';
+export { buildLanguageQueryPredicate, buildMessageLengthPredicate, buildSignalPredicate, buildSourcePredicate };
+export function validateQueryOptions(options) {
+    validateSignalSourceInputs(options);
+    validateOptionalTimestampRange(options);
+    if (options.dataType) {
+        buildSignalPredicate({
+            ...options,
+            dataType: options.dataType
+        });
+    }
+}
+export function buildQueryJobDefinition(options, resolved, now = new Date()) {
+    const predicate = buildSignalPredicate({
+        ...options,
+        dataType: resolved.dataType
+    });
+    const common = {
+        name: 'source',
+        datasetId: resolved.datasetId,
+        start: options.start ?? new Date(now.getTime() - 10 * 60 * 1000).toISOString(),
+        end: options.end ?? now.toISOString(),
+        sortOrder: options.sortOrder ?? GreprLlmPromptResultsSourceSortOrder.UNSORTED,
+        limit: options.limit ?? 100
+    };
+    const vertices = predicate.dataType === CreateLogsBackfillJobDataType.logs
+        ? buildLogsQueryVertices(options, common, predicate.query)
+        : buildSpansQueryVertices(options, common, predicate);
+    return {
+        name: `query_tool_job_${now.getTime()}`,
+        execution: JobExecution.SYNCHRONOUS,
+        processing: JobProcessing.BATCH,
+        jobGraph: {
+            vertices,
+            edges: ['source -> sink']
+        },
+        tags: {},
+        teamIds: resolved.teamIds
+    };
+}
+function buildLogsQueryVertices(options, common, query) {
+    const source = {
+        ...common,
+        type: options.queryEngine === 'flink'
+            ? LogsIcebergTableSourceType.logs_iceberg_table_source
+            : GreprRawLogsSourceType.grepr_raw_log_source,
+        query
+    };
+    return [
+        source,
+        {
+            type: LogsSynchronousSinkType.logs_sync_sink,
+            name: 'sink'
+        }
+    ];
+}
+function buildSpansQueryVertices(options, common, predicate) {
+    const sourceFields = {
+        ...common,
+        query: predicate.query,
+        ...predicate.spanFilters
+    };
+    const source = options.queryEngine === 'flink'
+        ? {
+            ...sourceFields,
+            type: TracesIcebergTableSourceType.traces_iceberg_table_source
+        }
+        : {
+            ...sourceFields,
+            type: GreprRawSpanSourceType.grepr_raw_span_source
+        };
+    const sink = {
+        type: SpansSynchronousSinkType.spans_sync_sink,
+        name: 'sink'
+    };
+    return [source, sink];
+}
 export class QueryCommand extends BaseCommand {
     getCommandName() {
         return 'query';
     }
     getCommandDescription() {
-        return 'Execute a query against a dataset';
+        return 'Execute a logs or spans query against a dataset';
     }
     getCommandOptions() {
         return [
+            {
+                flags: '--job-id <id>',
+                description: 'Source pipeline/job ID'
+            },
             {
                 flags: '--dataset-id <id>',
                 description: 'Dataset ID to query'
@@ -22,6 +103,11 @@ export class QueryCommand extends BaseCommand {
                 flags: '--dataset-name <name>',
                 description: 'Dataset name to query (will be resolved to ID)'
             },
+            {
+                flags: '--data-type <type>',
+                description: 'Data type (logs or spans; defaults to logs unless inferred from --job-id)',
+                parser: parseSignalDataType
+            },
             {
                 flags: '--sort-order <order>',
                 description: 'Sort order for results (UNSORTED, ASCENDING, DESCENDING)',
@@ -52,12 +138,12 @@ export class QueryCommand extends BaseCommand {
             },
             {
                 flags: '--message-length-min <number>',
-                description: 'Inclusive minimum message length in characters. Combined with --query as an AND predicate. Use 0 with --message-length-max 0 to find empty messages.',
+                description: 'Inclusive minimum message length in characters (logs only)',
                 parser: parseIntArg
             },
             {
                 flags: '--message-length-max <number>',
-                description: 'Inclusive maximum message length in characters. Combined with --query as an AND predicate. Use a large value (e.g., 32768) to find oversized messages with --message-length-min.',
+                description: 'Inclusive maximum message length in characters (logs only)',
                 parser: parseIntArg
             }
         ];
@@ -65,7 +151,6 @@ export class QueryCommand extends BaseCommand {
     addToProgram(program, mergeConfiguration) {
         let command = program.command(this.getCommandName())
             .description(this.getCommandDescription());
-        // Add command-specific options
         this.getCommandOptions().forEach(option => {
             if (option.parser && option.defaultValue !== undefined) {
                 command = command.option(option.flags, option.description, option.parser, option.defaultValue);
@@ -80,7 +165,6 @@ export class QueryCommand extends BaseCommand {
                 command = command.option(option.flags, option.description);
             }
         });
-        // Add streaming options
         command
             .option('-f, --format <format>', 'Output format (table, csv, pretty, raw, compact)', 'table')
             .option('-s, --sort <column:order>', 'Sort table by column (e.g., "eventTimestamp:asc")', 'eventTimestamp:asc')
@@ -88,109 +172,37 @@ export class QueryCommand extends BaseCommand {
             .option('--no-timestamps', 'Hide timestamps')
             .option('--no-job-state', 'Hide job state messages')
             .option('--max-lines <number>', 'Maximum lines per table cell', parseIntArg, 4)
-            .action(async (options, command) => {
+            .action(async (options, actionCommand) => {
             try {
-                const globalOptions = command.parent?.opts() || {};
-                const mergedGlobalOptions = await mergeConfiguration(globalOptions);
+                const globalOptions = actionCommand.parent?.opts() ?? {};
                 const mergedOptions = {
-                    ...mergedGlobalOptions,
+                    ...await mergeConfiguration(globalOptions),
                     ...options
                 };
                 await this.execute(mergedOptions);
             }
             catch (error) {
-                const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-                console.error('Fatal error:', errorMessage);
+                const message = error instanceof Error ? error.message : String(error);
+                console.error('Fatal error:', message);
                 process.exit(1);
             }
         });
     }
     async execute(options) {
         try {
-            this.validateQueryOptions(options);
-            this.initializeComponents(options);
-            // Resolve dataset ID
-            const datasetId = await this.resolveDatasetId(options);
-            // Create job definition
-            const jobDefinition = await this.createJobDefinition(options, datasetId);
+            validateQueryOptions(options);
+            const resolved = await resolveSignalSource(options, createApiClient(options), { includeTeamIds: false });
+            const jobDefinition = buildQueryJobDefinition(options, resolved);
+            if (resolved.dataType === CreateSpansBackfillJobDataType.spans) {
+                warnOnUnliftedSpanQuery(options.query ?? '');
+            }
+            if (!options.quiet && !options.datasetId) {
+                console.log(`Querying ${resolved.dataType} dataset ${resolved.datasetId}`);
+            }
             await this.processJobStream(jobDefinition, options);
         }
         catch (error) {
             this.handleError(error, 'Query initialization error');
-            process.exit(1);
-        }
-    }
-    validateQueryOptions(options) {
-        if (!options.datasetId && !options.datasetName) {
-            console.error('Error: Either --dataset-id or --dataset-name is required');
-            process.exit(1);
-        }
-        if (options.datasetId && options.datasetName) {
-            console.error('Error: Cannot specify both --dataset-id and --dataset-name');
-            process.exit(1);
-        }
-        validateOptionalTimestampRange(options);
-    }
-    async resolveDatasetId(options) {
-        if (options.datasetId) {
-            return options.datasetId;
-        }
-        if (!options.quiet) {
-            console.log(`Looking up dataset: ${options.datasetName}`);
-        }
-        if (!this.apiClient) {
-            throw new Error('API client not initialized');
-        }
-        if (!options.datasetName) {
-            throw new Error('Dataset name is required');
-        }
-        const dataset = await this.apiClient.lookupDataset(options.datasetName);
-        if (!dataset) {
-            throw new Error(`Dataset not found: ${options.datasetName}`);
-        }
-        if (!options.quiet) {
-            console.log(`Found dataset: ${dataset.name} (ID: ${dataset.id})`);
-        }
-        if (!dataset.id) {
-            throw new Error(`Dataset ${options.datasetName} found but has no ID`);
-        }
-        return dataset.id;
-    }
-    async createJobDefinition(options, datasetId) {
-        try {
-            // Defaults to SchemaGreprRawLogsSource when unset.
-            const sourceQuery = buildSourcePredicate(options);
-            const source = {
-                type: options.queryEngine === 'flink'
-                    ? LogsIcebergTableSourceType.logs_iceberg_table_source
-                    : GreprRawLogsSourceType.grepr_raw_log_source,
-                name: 'source',
-                datasetId: datasetId,
-                start: options.start || new Date(Date.now() - 10 * 60 * 1000).toISOString(), // Default: 10 minutes ago
-                end: options.end || new Date().toISOString(), // Default: now
-                query: sourceQuery,
-                sortOrder: options.sortOrder || GreprLlmPromptResultsSourceSortOrder.UNSORTED,
-                limit: options.limit || 100 // Default limit to stay under sync query limit
-            };
-            return {
-                name: `query_tool_job_${Date.now()}`,
-                execution: JobExecution.SYNCHRONOUS,
-                processing: JobProcessing.BATCH,
-                jobGraph: {
-                    vertices: [
-                        source,
-                        {
-                            type: LogsSynchronousSinkType.logs_sync_sink,
-                            name: 'sink'
-                        }
-                    ],
-                    edges: ['source -> sink']
-                },
-                tags: {}
-            };
-        }
-        catch (error) {
-            throw new Error(`Failed to create job definition: ${error.message}`);
         }
     }
 }

package/build/dist/commands/query-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-command.js","sourceRoot":"","sources":["../../../src/main/typescript/commands/query-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query-command.js","sourceRoot":"","sources":["../../../src/main/typescript/commands/query-command.ts"],"names":[],"mappings":"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"}