fix(layering): preserve import-type source symbols

Author: thymikee

scripts/layering/model.test.ts

@@ -61,6 +61,8 @@ test('parseImports records TSImportType edges separately from dynamic imports',
       "type Imported = import('./type-only.ts').Imported;",
       "type Queried = typeof import('./type-query.ts').value;",
       "type SameTarget = import('./same-target.ts').Target; void import('./same-target.ts');",
+      "type Nested = import('./nested.ts').namespace.SessionState;",
+      "type WholeModule = import('./whole-module.ts');",
     ].join('\n'),
   );
 
@@ -78,14 +80,14 @@ test('parseImports records TSImportType edges separately from dynamic imports',
         dynamic: false,
         typeOnly: true,
         line: 1,
-        symbols: [],
+        symbols: ['Imported'],
       },
       {
         spec: './type-query.ts',
         dynamic: false,
         typeOnly: true,
         line: 2,
-        symbols: [],
+        symbols: ['value'],
       },
       {
         spec: './same-target.ts',
@@ -99,6 +101,20 @@ test('parseImports records TSImportType edges separately from dynamic imports',
         dynamic: false,
         typeOnly: true,
         line: 3,
+        symbols: ['Target'],
+      },
+      {
+        spec: './nested.ts',
+        dynamic: false,
+        typeOnly: true,
+        line: 4,
+        symbols: ['namespace'],
+      },
+      {
+        spec: './whole-module.ts',
+        dynamic: false,
+        typeOnly: true,
+        line: 5,
         symbols: [],
       },
     ],
@@ -220,6 +236,7 @@ test('parseImports retains named source symbols without changing edge-kind detec
       "import type { TypeB as RenamedType } from './types.ts';",
       "export { reExport as publicName } from './re-export.ts';",
       "export type { ExportedType } from './exported-types.ts';",
+      "export * from './re-export-all.ts';",
       "import * as namespace from './namespace.ts';",
       "void import('./dynamic.ts');",
     ].join('\n'),
@@ -237,6 +254,7 @@ test('parseImports retains named source symbols without changing edge-kind detec
       { spec: './types.ts', dynamic: false, typeOnly: true, symbols: ['TypeB'] },
       { spec: './re-export.ts', dynamic: false, typeOnly: false, symbols: ['reExport'] },
       { spec: './exported-types.ts', dynamic: false, typeOnly: true, symbols: ['ExportedType'] },
+      { spec: './re-export-all.ts', dynamic: false, typeOnly: false, symbols: [] },
       { spec: './namespace.ts', dynamic: false, typeOnly: false, symbols: [] },
       { spec: './dynamic.ts', dynamic: true, typeOnly: false, symbols: [] },
     ],

scripts/layering/model.ts

@@ -190,6 +190,13 @@ function namedSymbols(
   return [...new Set(symbols)];
 }
 
+function importTypeSourceName(qualifier: unknown): string | undefined {
+  if (qualifier === null || typeof qualifier !== 'object') return undefined;
+  const record = qualifier as Record<string, unknown>;
+  if (record.type === 'Identifier') return importedName(qualifier);
+  return record.type === 'TSQualifiedName' ? importTypeSourceName(record.left) : undefined;
+}
+
 function specifierTypeOnly(
   declaration: Record<string, unknown>,
   specifiers: readonly Record<string, unknown>[],
@@ -272,7 +279,14 @@ export function parseImports(source: string): ImportEdge[] {
     } else if (node.type === 'ExportAllDeclaration') {
       edge = staticImportEdge(source, node, node.source, node.exportKind === 'type', []);
     } else if (node.type === 'TSImportType') {
-      edge = staticImportEdge(source, node, node.source, true, []);
+      const sourceName = importTypeSourceName(node.qualifier);
+      edge = staticImportEdge(
+        source,
+        node,
+        node.source,
+        true,
+        sourceName === undefined ? [] : [sourceName],
+      );
     }
     if (edge) located.push({ edge, start, order: order++ });
   });

scripts/layering/session-authority-overlay.test.ts

@@ -135,3 +135,23 @@ test('the end-to-end measurement feeds the ratchet: a new handler importer is re
   assert.equal(violations.length, 1);
   assert.equal(violations[0]!.file, 'src/daemon/handlers/new.ts');
 });
+
+test('R75 catches a new handler shape edge expressed as an import type', () => {
+  const base = {
+    'src/daemon/session-state.ts': STATE_STUB,
+    'src/daemon/session-store.ts': STORE_STUB,
+  };
+  const reference = handlerOwnedOverlay(overlayOf(base));
+  const measured = handlerOwnedOverlay(
+    overlayOf({
+      ...base,
+      'src/daemon/handlers/new.ts': "type State = import('../session-state.ts').SessionState;\n",
+    }),
+  );
+
+  const violations = checkSessionAuthorityOverlay(measured, reference);
+  assert.equal(violations.length, 1);
+  assert.equal(violations[0]!.rule, SESSION_AUTHORITY_OVERLAY_RULE);
+  assert.equal(violations[0]!.file, 'src/daemon/handlers/new.ts');
+  assert.match(violations[0]!.message, /new handler-owned SessionState shape edge/);
+});