Skip to content

refactor(content): delegate content-dir resolution to MCP contentDirPath (mcp 2.1.0) #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ABB65 merged 1 commit into from
Jul 17, 2026
Merged

refactor(content): delegate content-dir resolution to MCP contentDirPath (mcp 2.1.0) #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"dependencies": {
"@anthropic-ai/sdk": "^0.112.1",
"@aws-sdk/client-s3": "^3.1076.0",
"@contentrain/mcp": "2.0.1",
"@contentrain/mcp": "2.1.0",
"@contentrain/query": "^7.0.1",
"@contentrain/types": "0.9.0",
"@gitbeaker/rest": "^43.8.0",
Expand Down
12 changes: 6 additions & 6 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 8 additions & 9 deletions server/utils/content-paths.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { ModelDefinition } from '@contentrain/types'
import { CONTENTRAIN_DIR, PATH_PATTERNS } from '@contentrain/types'
import { contentFilePath, documentFilePath, metaFilePath } from '@contentrain/mcp/core/ops'
import { contentDirPath, contentFilePath, documentFilePath, metaFilePath } from '@contentrain/mcp/core/ops'

/**
* Resolve file paths for Contentrain content operations.
Expand All @@ -12,8 +12,7 @@ import { contentFilePath, documentFilePath, metaFilePath } from '@contentrain/mc
* across locales instead of pinning to the default locale. Studio keeps only
* what MCP's helpers deliberately don't cover: the `contentRoot` prefix, the
* `content_path` security hardening, and the "return the directory when a
* document has no slug" case (MCP requires a slug and does not export its
* `contentDirPath`).
* document has no slug" case (MCP requires a slug).
*/

export interface PathContext {
Expand Down Expand Up @@ -52,18 +51,18 @@ function assertSafeContentPath(model: Pick<ModelDefinition, 'content_path'>): vo
}

/**
* Content directory (content-root-relative) for a model. Mirrors MCP's
* `contentDirPath` (`@contentrain/mcp/core/ops`, not publicly exported): a
* `content_path` override moves files OUTSIDE `.contentrain/`, otherwise they
* live under the model id. Prefixed with the project's content root.
* Content directory (content-root-relative) for a model. Delegates the dir
* computation to MCP's `contentDirPath` (`@contentrain/mcp/core/ops`, exported
* since 2.1.0) so the `content_path` override / default layout can never drift
* from MCP's write path. Studio adds only the `content_path` security guard and
* the project content-root prefix — neither of which MCP's helper covers.
*/
function resolveContentDirForModel(
ctx: PathContext,
model: Pick<ModelDefinition, 'id' | 'domain' | 'content_path'>,
): string {
assertSafeContentPath(model)
const dir = model.content_path ?? `${CONTENTRAIN_DIR}/content/${model.domain}/${model.id}`
return prefixed(ctx.contentRoot, dir)
return prefixed(ctx.contentRoot, contentDirPath(model))
}

/**
Expand Down
Loading