Integrate current Copilot admission and setup repairs

Co-Authored-By: Paperclip <noreply@paperclip.ing>

* codex/copilot-saved-token-setup-v30:
  Preserve Copilot task catalogs and repair ordinary startup
  Align Copilot contract history tests with profile v33

server/src/__tests__/idle-admission.test.ts

@@ -49,6 +49,20 @@ describe("idle admission", () => {
     expect(idleWorkSnapshot().active).toBe(0);
   });
 
+  it("tracks ordinary middleware with non-router stack metadata", async () => {
+    const server = app(), done = deferred();
+    const middleware = Object.assign(async (_req: express.Request, res: express.Response) => {
+      res.sendStatus(202); await done.promise;
+    }, { stack: { name: "middleware metadata" } });
+    server.use(middleware);
+    expect(() => trackIdleRequestHandlers(server)).not.toThrow();
+    await request(server).get("/work").expect(202);
+    expect(idleWorkSnapshot().active).toBe(1);
+    done.resolve();
+    await new Promise(resolve => setImmediate(resolve));
+    expect(idleWorkSnapshot().active).toBe(0);
+  });
+
   it("does not mistake a client disconnect for completed accepted work", async () => {
     const server = app();
     const entered = deferred(), done = deferred(), closed = deferred();

server/src/middleware/idle-admission.ts

@@ -61,7 +61,7 @@ export function trackIdleRequestHandlers(app: Application): void {
       if (seen.has(layer)) continue;
       seen.add(layer);
       if (layer.route) { visit(layer.route.stack, true); continue; }
-      if (layer.handle.stack) { visit(layer.handle.stack); continue; }
+      if (Array.isArray(layer.handle.stack)) { visit(layer.handle.stack); continue; }
       const original = layer.handle;
       if (original === idleAdmissionMiddleware) continue;
       const invoke = (req: Request, args: unknown[]) => {