Skip to content

fix(artifact): reconcile imported hashes against git on bootstrap (1/3) #868

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

Open
moofone wants to merge 4 commits into
base: main
Choose a base branch
from
+785 −10
Open

fix(artifact): reconcile imported hashes against git on bootstrap (1/3) #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd4f313
fix(artifact): reconcile imported hashes against git on bootstrap
moofone Jul 4, 2026
e09f821
Merge remote-tracking branch 'origin/main' into fix/incremental-boots…
moofone Jul 5, 2026
2e49906
fix(artifact): restrict reconcile restamp to commit-tracked paths
moofone Jul 5, 2026
ba58244
style: clang-format artifact reconcile additions
moofone Jul 5, 2026
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
1 change: 1 addition & 0 deletions scripts/security-allowlist.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ src/pipeline/pass_githistory.c:popen:via cbm_popen wrapper call
# ── Pipeline: artifact persistence (git HEAD hash, merge driver config) ────
src/pipeline/artifact.c:cbm_popen:git rev-parse HEAD for artifact metadata (hardcoded cmd)
src/pipeline/artifact.c:cbm_popen:git config merge.ours.driver for gitattributes (hardcoded cmd)
src/pipeline/artifact.c:cbm_popen:git diff/ls-files/ls-tree/cat-file for bootstrap hash reconciliation (commit hex-validated via is_hex_oid, repo path shell-validated via cbm_validate_shell_arg)
src/pipeline/artifact.c:popen:via cbm_popen wrapper calls

# ── UI: HTTP server process management ─────────────────────────────────────
Expand Down
8 changes: 7 additions & 1 deletion src/mcp/mcp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3246,7 +3246,13 @@ static void try_artifact_bootstrap(const char *project_name, const char *repo_pa
project_db_path(project_name, db_buf, sizeof(db_buf));
if (cbm_file_size(db_buf) < 0 && cbm_artifact_exists(repo_path)) {
cbm_log_info("index.artifact_bootstrap", "project", project_name);
cbm_artifact_import(repo_path, db_buf);
if (cbm_artifact_import(repo_path, db_buf) == 0) {
/* Reconcile imported (foreign-mtime) hash rows against the local
* working tree so the first incremental run classifies by actual
* git diff instead of re-parsing ~everything. Best-effort: a -1
* return leaves rows foreign and falls back to today's behavior. */
(void)cbm_artifact_reconcile_hashes(repo_path, db_buf, project_name);
}
}
}

Expand Down
Loading
Loading