carrick 0.3.107 → 0.3.108

package/sidecar/dist/src/types.d.ts

@@ -542,9 +542,77 @@ export interface BundleResponse extends BaseResponse {
 export interface InferResponse extends BaseResponse {
     /** Successfully inferred types */
     inferred_types?: InferredType[];
+    /** How long the requests took, and which were slowest (carrick#1985) */
+    infer_timing?: InferTiming;
     /** General errors */
     errors?: string[];
 }
+/**
+ * How long one request of an `infer` batch took (carrick#1985).
+ *
+ * It names the request and measures its answer. It never holds the answer:
+ * the type a request printed is here as a length only.
+ */
+export interface InferSlotTiming {
+    /** The alias the request carried, when it carried one */
+    alias?: string;
+    /** The file the request named, as it named it */
+    file_path: string;
+    /** The line the request named */
+    line_number: number;
+    /** The kind of inference the request asked for */
+    infer_kind: InferKind;
+    /**
+     * Wall time, in milliseconds, from the batch taking the request up to it
+     * keeping the request's answer or its error.
+     */
+    ms: number;
+    /**
+     * Of `ms`, the time in the compiler call that computes the type: a
+     * function's `getReturnType()`, a parameter's `getType()`. It is told
+     * apart for `signature_return` and `function_param`, and is 0 for the
+     * other kinds, whose time in the compiler stays in `ms` alone.
+     */
+    type_ms: number;
+    /**
+     * Of `ms`, the time in the inferrer's print of a type to text. Truncation
+     * is off, so a type is printed at its whole length. For
+     * `signature_return` and `function_param` this is every print the request
+     * makes; the other kinds also print through the structural expander, and
+     * that time stays in `ms` alone.
+     */
+    print_ms: number;
+    /** Characters in the `type_string` the request printed; 0 when it printed none */
+    printed_length: number;
+    /**
+     * No earlier request named this file to the project that answered. Such a
+     * request does the work the file's later ones reuse: the index of the
+     * file's functions, and every type the checker resolves on the way that it
+     * had not resolved before.
+     */
+    first_in_file: boolean;
+}
+/**
+ * The timing of the requests of one `infer` batch (carrick#1985).
+ */
+export interface InferTiming {
+    /** Requests the batch was done with: answered, refused, skipped or failed */
+    slots: number;
+    /** Their wall times, added up, in milliseconds */
+    slots_ms: number;
+    /** Of `slots_ms`, the time computing types (each request's `type_ms`) */
+    type_ms: number;
+    /** Of `slots_ms`, the time printing types (each request's `print_ms`) */
+    print_ms: number;
+    /** How many of them were the first asked of their file */
+    first_in_file_slots: number;
+    /** The wall times of those, added up, in milliseconds */
+    first_in_file_ms: number;
+    /** The slowest requests, slowest first: `SLOWEST_SLOTS` of them at most */
+    slowest: InferSlotTiming[];
+    /** The request that printed the longest type; absent when none printed one */
+    longest_printed?: InferSlotTiming;
+}
 /**
  * Response for resolve_definitions action
  */
@@ -934,6 +1002,8 @@ export interface InferResult {
     success: boolean;
     /** Successfully inferred types */
     inferred_types?: InferredType[];
+    /** How long each request took, summed up (carrick#1985) */
+    timing: InferTiming;
     /** General error messages */
     errors?: string[];
 }

package/sidecar/dist/src/validators.d.ts

@@ -305,6 +305,7 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
         span_end: z.ZodOptional<z.ZodNumber>;
         line_number: z.ZodOptional<z.ZodNumber>;
         expression_text: z.ZodOptional<z.ZodString>;
+        param_name: z.ZodOptional<z.ZodString>;
         unwrap: z.ZodOptional<z.ZodEnum<["awaited", "none"]>>;
     }, "strip", z.ZodTypeAny, {
         kind: "infer";
@@ -315,6 +316,7 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
         span_start?: number | undefined;
         span_end?: number | undefined;
         expression_text?: string | undefined;
+        param_name?: string | undefined;
         unwrap?: "awaited" | "none" | undefined;
     }, {
         kind: "infer";
@@ -325,6 +327,7 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
         span_start?: number | undefined;
         span_end?: number | undefined;
         expression_text?: string | undefined;
+        param_name?: string | undefined;
         unwrap?: "awaited" | "none" | undefined;
     }>, z.ZodObject<{
         kind: z.ZodLiteral<"literal">;
@@ -375,10 +378,6 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
     tsconfig_path: z.ZodOptional<z.ZodString>;
     scan_root: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    request_id: string;
-    action: "capture_v2";
-    repo_root: string;
-    service_name: string;
     anchors: ({
         kind: "symbol";
         symbol_name: string;
@@ -401,6 +400,7 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
         span_start?: number | undefined;
         span_end?: number | undefined;
         expression_text?: string | undefined;
+        param_name?: string | undefined;
         unwrap?: "awaited" | "none" | undefined;
     } | {
         kind: "literal";
@@ -415,14 +415,14 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
         }[] | undefined;
         raw_text_read?: true | undefined;
     })[];
-    out_dir: string;
-    tsconfig_path?: string | undefined;
-    scan_root?: string | undefined;
-}, {
     request_id: string;
     action: "capture_v2";
     repo_root: string;
     service_name: string;
+    out_dir: string;
+    tsconfig_path?: string | undefined;
+    scan_root?: string | undefined;
+}, {
     anchors: ({
         kind: "symbol";
         symbol_name: string;
@@ -445,6 +445,7 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
         span_start?: number | undefined;
         span_end?: number | undefined;
         expression_text?: string | undefined;
+        param_name?: string | undefined;
         unwrap?: "awaited" | "none" | undefined;
     } | {
         kind: "literal";
@@ -459,6 +460,10 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
         }[] | undefined;
         raw_text_read?: true | undefined;
     })[];
+    request_id: string;
+    action: "capture_v2";
+    repo_root: string;
+    service_name: string;
     out_dir: string;
     tsconfig_path?: string | undefined;
     scan_root?: string | undefined;
@@ -2088,6 +2093,7 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
         span_end: z.ZodOptional<z.ZodNumber>;
         line_number: z.ZodOptional<z.ZodNumber>;
         expression_text: z.ZodOptional<z.ZodString>;
+        param_name: z.ZodOptional<z.ZodString>;
         unwrap: z.ZodOptional<z.ZodEnum<["awaited", "none"]>>;
     }, "strip", z.ZodTypeAny, {
         kind: "infer";
@@ -2098,6 +2104,7 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
         span_start?: number | undefined;
         span_end?: number | undefined;
         expression_text?: string | undefined;
+        param_name?: string | undefined;
         unwrap?: "awaited" | "none" | undefined;
     }, {
         kind: "infer";
@@ -2108,6 +2115,7 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
         span_start?: number | undefined;
         span_end?: number | undefined;
         expression_text?: string | undefined;
+        param_name?: string | undefined;
         unwrap?: "awaited" | "none" | undefined;
     }>, z.ZodObject<{
         kind: z.ZodLiteral<"literal">;
@@ -2158,10 +2166,6 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
     tsconfig_path: z.ZodOptional<z.ZodString>;
     scan_root: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    request_id: string;
-    action: "capture_v2";
-    repo_root: string;
-    service_name: string;
     anchors: ({
         kind: "symbol";
         symbol_name: string;
@@ -2184,6 +2188,7 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
         span_start?: number | undefined;
         span_end?: number | undefined;
         expression_text?: string | undefined;
+        param_name?: string | undefined;
         unwrap?: "awaited" | "none" | undefined;
     } | {
         kind: "literal";
@@ -2198,14 +2203,14 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
         }[] | undefined;
         raw_text_read?: true | undefined;
     })[];
-    out_dir: string;
-    tsconfig_path?: string | undefined;
-    scan_root?: string | undefined;
-}, {
     request_id: string;
     action: "capture_v2";
     repo_root: string;
     service_name: string;
+    out_dir: string;
+    tsconfig_path?: string | undefined;
+    scan_root?: string | undefined;
+}, {
     anchors: ({
         kind: "symbol";
         symbol_name: string;
@@ -2228,6 +2233,7 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
         span_start?: number | undefined;
         span_end?: number | undefined;
         expression_text?: string | undefined;
+        param_name?: string | undefined;
         unwrap?: "awaited" | "none" | undefined;
     } | {
         kind: "literal";
@@ -2242,6 +2248,10 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
         }[] | undefined;
         raw_text_read?: true | undefined;
     })[];
+    request_id: string;
+    action: "capture_v2";
+    repo_root: string;
+    service_name: string;
     out_dir: string;
     tsconfig_path?: string | undefined;
     scan_root?: string | undefined;
@@ -3650,3 +3660,31 @@ export type ValidatedInferRequest = z.infer<typeof InferRequestSchema>;
 export type ValidatedHealthRequest = z.infer<typeof HealthRequestSchema>;
 export type ValidatedShutdownRequest = z.infer<typeof ShutdownRequestSchema>;
 export type ValidatedSidecarRequest = z.infer<typeof SidecarRequestSchema>;
+/** Every key any member of a union declares. */
+type KeysOfAny<Union> = Union extends unknown ? keyof Union : never;
+/** What `Key` holds, across the members of a union that declare it. */
+type ValueAt<Union, Key extends PropertyKey> = Union extends unknown ? Key extends keyof Union ? Union[Key] : never : never;
+/** The members of `Other` with the tag `One` has, when `One` has one. */
+type SameVariant<One, Other> = One extends {
+    action: infer Tag;
+} ? Extract<Other, {
+    action: Tag;
+}> : One extends {
+    kind: infer Tag;
+} ? Extract<Other, {
+    kind: Tag;
+}> : Other;
+/**
+ * The keys of `One` that `Other` does not declare, each as the path that
+ * reaches it; `never` when there are none.
+ */
+type UndeclaredKeys<One, Other, At extends string = ''> = One extends readonly (infer Item)[] ? UndeclaredKeys<Item, Other extends readonly (infer Element)[] ? Element : never, `${At}[]`> : One extends object ? {
+    [Key in keyof One & string]-?: Key extends KeysOfAny<SameVariant<One, Other>> ? UndeclaredKeys<One[Key], ValueAt<SameVariant<One, Other>, Key>, `${At}.${Key}`> : `${At}.${Key}`;
+}[keyof One & string] : never;
+/** Compiles for `never` alone. */
+type None<Paths extends never> = Paths;
+/** A key a handler may read that the schema would drop. */
+export type KeysTheSchemaDrops = None<UndeclaredKeys<SidecarRequest, ValidatedSidecarRequest>>;
+/** A key the schema lets through that no handler's type knows. */
+export type KeysNoHandlerKnows = None<UndeclaredKeys<ValidatedSidecarRequest, SidecarRequest>>;
+export {};

package/sidecar/dist/src/validators.js

@@ -176,6 +176,10 @@ const CaptureAnchorRequestSchema = z.discriminatedUnion('kind', [
         span_end: z.number().int().nonnegative().optional(),
         line_number: z.number().int().positive().optional(),
         expression_text: z.string().optional(),
+        // Any string, the empty one included: a name no parameter has is the
+        // capture's to demote, and refusing it here would fail every anchor of
+        // the request.
+        param_name: z.string().optional(),
         unwrap: z.enum(['awaited', 'none']).optional(),
     }),
     z.object({

package/templates/skills/carrick-reuse.md

@@ -44,11 +44,12 @@ find_similar({{SCOPE}})
 Call again with `offset: <next_offset>` for as long as the response carries
 `has_more`, and class what every page returned.
 
-Where the project is larger than one pass, the response carries `error` in place
-of clusters and names the two routes under the ceiling: a `service`, or a higher
-`min_lines`. Take the route the response names and run it again. Where
-`truncated` is present the audit is partial, and its `scanned_functions` of `of`
-says by how much.
+Where the project is larger than one pass, the response carries `window`: the
+functions it compared, in path order, each against every function after them.
+Call again with `scan_from: <next_scan_from>` until a response carries no
+`next_scan_from`; the windows together compare every pair once. `path` narrows
+an audit to one directory. Where `truncated` is present the audit is partial,
+and its `scanned_functions` of `of` says by how much.
 
 ## Class every row