carrick 0.3.120 → 0.3.122

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carrick",
-  "version": "0.3.120",
+  "version": "0.3.122",
   "carrickCache": {
     "cache_version": 22,
     "intent_cache_version": 2
@@ -113,11 +113,11 @@
     "zod": "^3.23.0"
   },
   "optionalDependencies": {
-    "@carrick-tools/cli-darwin-arm64": "0.3.120",
-    "@carrick-tools/cli-darwin-x64": "0.3.120",
-    "@carrick-tools/cli-linux-arm64": "0.3.120",
-    "@carrick-tools/cli-linux-x64": "0.3.120",
-    "@carrick-tools/cli-win32-x64": "0.3.120"
+    "@carrick-tools/cli-darwin-arm64": "0.3.122",
+    "@carrick-tools/cli-darwin-x64": "0.3.122",
+    "@carrick-tools/cli-linux-arm64": "0.3.122",
+    "@carrick-tools/cli-linux-x64": "0.3.122",
+    "@carrick-tools/cli-win32-x64": "0.3.122"
   },
   "devDependencies": {
     "@types/node": "^24.13.3"

package/plugin/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "carrick",
   "description": "Claude Code plugin for Carrick, which indexes TypeScript codebases across service and repository boundaries. After each edit it adds the file's routes, calls, and cross-service type mismatches to the session, and it registers Carrick's language server. It pairs with the Carrick MCP server, which lets agents search functions by intent rather than name.",
-  "version": "0.3.120",
+  "version": "0.3.122",
   "author": {
     "name": "Carrick",
     "email": "hello@carrick.tools"

package/sidecar/dist/src/library-claims.js

@@ -1694,7 +1694,7 @@ class DeclarationReader {
         for (const signature of callee.signatures) {
             const count = signature.getParameters().length;
             for (let arg = 0; arg < count; arg++) {
-                if (this.literalsAt(signature, { arg }).has(claim.name))
+                if (this.literalsAt(signature, { arg }, callee.holder).has(claim.name))
                     return VERIFIED;
             }
         }
@@ -2127,9 +2127,11 @@ class DeclarationReader {
     /**
      * The string literals a slot spells: the literal parts of its type, through
      * a type parameter's constraint, and the property names of a map a `keyof`
-     * reads, both as instantiated and as written at the declaration.
+     * reads, both as instantiated and as written at the declaration. `holder`
+     * is the type the member was read from: a map that is a type parameter of
+     * a base class is read as the holder's class chain binds it.
      */
-    literalsAt(signature, at) {
+    literalsAt(signature, at, holder) {
         const literals = new Set();
         let slot = this.parameterAt(signature, at.arg);
         if (slot !== undefined && slot !== VARIADIC && at.key !== undefined) {
@@ -2137,16 +2139,16 @@ class DeclarationReader {
             slot = property ? this.checker.getTypeOfSymbol(property) : undefined;
         }
         if (slot !== undefined && slot !== VARIADIC)
-            this.spell(slot, literals, 0);
+            this.spell(slot, literals, 0, holder);
         if (at.key === undefined) {
             const parameters = signature.getDeclaration()?.parameters;
             const node = parameters?.[Math.min(at.arg, parameters.length - 1)]?.type;
             if (node)
-                this.spell(this.checker.getTypeFromTypeNode(node), literals, 0);
+                this.spell(this.checker.getTypeFromTypeNode(node), literals, 0, holder);
         }
         return literals;
     }
-    spell(type, into, depth) {
+    spell(type, into, depth, holder) {
         if (depth > 6)
             return;
         if (type.isStringLiteral()) {
@@ -2155,16 +2157,18 @@ class DeclarationReader {
         }
         if (type.isUnionOrIntersection()) {
             for (const part of type.types)
-                this.spell(part, into, depth + 1);
+                this.spell(part, into, depth + 1, holder);
             return;
         }
         if (type.flags & ts.TypeFlags.TypeParameter) {
             const constraintNode = this.declaredConstraint(type);
-            this.spell(constraintNode ? this.checker.getTypeFromTypeNode(constraintNode) : this.checker.getBaseConstraintOfType(type) ?? type, into, depth + 1);
+            this.spell(constraintNode ? this.checker.getTypeFromTypeNode(constraintNode) : this.checker.getBaseConstraintOfType(type) ?? type, into, depth + 1, holder);
             return;
         }
         if (type.flags & ts.TypeFlags.Index) {
             let map = type.type;
+            if (map.flags & ts.TypeFlags.TypeParameter)
+                map = this.heritageArgument(map, holder);
             if (map.flags & ts.TypeFlags.TypeParameter) {
                 map = this.checker.getDefaultFromTypeParameter(map) ?? this.checker.getBaseConstraintOfType(map) ?? map;
             }
@@ -2174,6 +2178,49 @@ class DeclarationReader {
             }
         }
     }
+    /**
+     * The type argument a class's type parameter takes in `holder`'s class
+     * chain: the argument a heritage clause passes for it
+     * (`class Channel<L> extends Emitter<L, Reserved>` binds Emitter's second
+     * parameter to `Reserved`), followed down the chain while that argument is
+     * a type parameter of a class below. A parameter no heritage clause binds
+     * comes back as it is (or as the last parameter it was bound to), for the
+     * caller to read at its default.
+     */
+    heritageArgument(parameter, holder) {
+        const bases = [];
+        const seen = new Set();
+        const visit = (type, depth) => {
+            if (depth > 8)
+                return;
+            if (type.isIntersection()) {
+                for (const part of type.types)
+                    visit(part, depth + 1);
+                return;
+            }
+            const target = (type.objectFlags ?? 0) & ts.ObjectFlags.Reference ? type.target : type;
+            if (!((target.objectFlags ?? 0) & ts.ObjectFlags.ClassOrInterface) || seen.has(target))
+                return;
+            seen.add(target);
+            for (const base of this.checker.getBaseTypes(target)) {
+                if ((base.objectFlags ?? 0) & ts.ObjectFlags.Reference)
+                    bases.push(base);
+                visit(base, depth + 1);
+            }
+        };
+        visit(this.checker.getNonNullableType(holder), 0);
+        let bound = parameter;
+        for (let step = 0; step <= bases.length && bound.flags & ts.TypeFlags.TypeParameter; step++) {
+            const base = bases.find(each => (each.target.typeParameters ?? []).includes(bound));
+            if (!base)
+                break;
+            const argument = this.checker.getTypeArguments(base)[base.target.typeParameters.indexOf(bound)];
+            if (!argument)
+                break;
+            bound = argument;
+        }
+        return bound;
+    }
     /**
      * The callee of a message claim: the claim's member `path` walked from the
      * receiver hop by hop (`client.tasks.trigger`), then `member` of the object
@@ -2219,7 +2266,7 @@ class DeclarationReader {
             ? library
             : library.filter(signature => this.isOwnFile(this.signatureFile(signature, type, form), home));
         if (own.length > 0)
-            return { signatures: own };
+            return { signatures: own, holder: holder.type };
         if (library.length > 0)
             return { failure: failed('member_inherited') };
         return { failure: this.slotFailure(type, form === 'new' ? 'member_not_constructible' : 'member_not_callable') };
@@ -2517,10 +2564,10 @@ class DeclarationReader {
         // null member reads them.
         const call = this.ownCallee(holder, [], null, 'call');
         if ('signatures' in call)
-            fills.push(() => (receiver.call = this.listSignatures(call.signatures, take)));
+            fills.push(() => (receiver.call = this.listSignatures(call.signatures, holder.type, take)));
         const construct = this.ownCallee(holder, [], null, 'new');
         if ('signatures' in construct) {
-            fills.push(() => (receiver.construct = this.listSignatures(construct.signatures, take)));
+            fills.push(() => (receiver.construct = this.listSignatures(construct.signatures, holder.type, take)));
         }
         if (this.isOpenTop(type))
             return receiver;
@@ -2537,12 +2584,12 @@ class DeclarationReader {
                 const own = 'signatures' in callee;
                 const member = { name: property.getName(), own, signatures: [] };
                 receiver.members.push(member);
-                fills.push(() => (member.signatures = this.listSignatures(own ? callee.signatures : library, take)));
+                fills.push(() => (member.signatures = this.listSignatures(own ? callee.signatures : library, holder.type, take)));
             }
         });
         return receiver;
     }
-    listSignatures(signatures, take) {
+    listSignatures(signatures, holder, take) {
         const listed = [];
         for (const signature of signatures) {
             if (!take())
@@ -2572,7 +2619,7 @@ class DeclarationReader {
                     if (keys.length > 0)
                         param.keys = keys;
                 }
-                const literals = this.literalsAt(signature, { arg: index });
+                const literals = this.literalsAt(signature, { arg: index }, holder);
                 if (literals.size > 0)
                     param.literals = [...literals].sort();
                 params.push(param);
@@ -2686,7 +2733,7 @@ class DeclarationReader {
             return declaration !== undefined && this.isLibraryFile(declaration.getSourceFile());
         });
         if (signatures.length > 0)
-            return { signatures };
+            return { signatures, holder: type };
         return { failure: this.slotFailure(type, 'member_not_callable') };
     }
     /**