Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions .dependency-cruiser.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/** @type {import('dependency-cruiser').IConfiguration} */
module.exports = {
forbidden: [
{
name: "domains-must-not-import-app",
severity: "error",
from: { path: "^apps/api-ts/src/domains/" },
to: { path: "^apps/api-ts/src/app/" },
},
{
name: "lib-must-not-import-domains",
severity: "error",
from: { path: "^apps/api-ts/src/lib/" },
to: { path: "^apps/api-ts/src/domains/" },
},
{
name: "lib-must-not-import-app",
severity: "error",
from: { path: "^apps/api-ts/src/lib/" },
to: { path: "^apps/api-ts/src/app/" },
},
{
name: "provider-services-must-not-import-app",
severity: "error",
from: { path: "^apps/api-ts/src/domains/providers/services/" },
to: { path: "^apps/api-ts/src/app/" },
},
],
options: {
doNotFollow: {
path: "node_modules",
},
exclude: {
path: "(^|/)(dist|dist-electron|coverage|node_modules)/",
},
tsPreCompilationDeps: true,
enhancedResolveOptions: {
extensions: [".ts", ".tsx", ".js", ".jsx", ".json"],
},
reporterOptions: {
dot: {
collapsePattern:
"node_modules/[^/]+|packages/[^/]+|apps/api-ts/src/(app|domains|lib|platform)",
},
},
},
};
15 changes: 11 additions & 4 deletions apps/api-ts/src/app/create-server.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,28 @@ afterEach(() => {
describe("parseConversationSearchProviders", () => {
it("accepts comma-separated provider ids", () => {
expect(
parseConversationSearchProviders("codex,chatgpt,copilot"),
parseConversationSearchProviders("codex,claude,copilot"),
).toEqual({
providers: ["codex", "chatgpt", "copilot"],
providers: ["codex", "claude", "copilot"],
invalid: [],
});
});

it("dedupes repeated providers and reports invalid tokens", () => {
expect(
parseConversationSearchProviders(["codex,chatgpt", "codex,unknown"]),
parseConversationSearchProviders(["codex,claude", "codex,unknown"]),
).toEqual({
providers: ["codex", "chatgpt"],
providers: ["codex", "claude"],
invalid: ["unknown"],
});
});

it("keeps internal ChatGPT legacy data out of public search scope", () => {
expect(parseConversationSearchProviders("codex,chatgpt")).toEqual({
providers: ["codex"],
invalid: ["chatgpt"],
});
});
});

describe("local API auth guard", () => {
Expand Down
10 changes: 5 additions & 5 deletions apps/api-ts/src/app/create-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
} from "../lib/utils.js";

import type { ProviderId } from "../domains/providers/types.js";
import { parseProviderId } from "../domains/providers/path-safety.js";
import { parseSearchableProviderId } from "../domains/providers/capabilities.js";
import { getDataSourceInventoryTs } from "../domains/recovery/inventory.js";
import { invalidateOverviewTsCache } from "../domains/threads/overview.js";
import {
Expand All @@ -38,9 +38,9 @@ import {
import {
registerPlatformRoutes,
type ProxyRequest,
} from "./routes/platform.js";
import { registerThreadRoutes } from "./routes/threads.js";
import { registerProviderRoutes } from "./routes/providers.js";
} from "./routes/platform/index.js";
import { registerThreadRoutes } from "./routes/threads/index.js";
import { registerProviderRoutes } from "./routes/providers/index.js";

type RuntimeCacheEntry = {
expires_at: number;
Expand Down Expand Up @@ -120,7 +120,7 @@ export function parseConversationSearchProviders(
const providers: ProviderId[] = [];
const invalid: string[] = [];
for (const token of tokens) {
const parsed = parseProviderId(token);
const parsed = parseSearchableProviderId(token);
if (!parsed) {
invalid.push(token);
continue;
Expand Down
Loading
Loading