erdos-problems 0.2.10 → 0.3.0

package/src/runtime/paths.js

@@ -136,6 +136,14 @@ export function getWorkspaceArchiveDir(problemId, workspaceRoot = getWorkspaceRo
   return path.join(getWorkspaceArchivesDir(workspaceRoot), String(problemId));
 }
 
+export function getWorkspacePapersDir(workspaceRoot = getWorkspaceRoot()) {
+  return path.join(getWorkspaceDir(workspaceRoot), 'papers');
+}
+
+export function getWorkspaceProblemPaperDir(problemId, workspaceRoot = getWorkspaceRoot()) {
+  return path.join(getWorkspacePapersDir(workspaceRoot), String(problemId));
+}
+
 export function getWorkspaceProblemCheckpointsDir(workspaceRoot = getWorkspaceRoot()) {
   return path.join(getWorkspaceCheckpointsDir(workspaceRoot), 'problem-checkpoints');
 }
@@ -196,6 +204,14 @@ export function getRepoUpstreamDiffPath() {
   return path.join(getRepoAnalysisDir(), 'UPSTREAM_DIFF.md');
 }
 
+export function getRepoPaperDir() {
+  return path.join(repoRoot, 'paper');
+}
+
+export function getRepoProblemPaperDir(problemId) {
+  return path.join(getRepoPaperDir(), 'problems', String(problemId));
+}
+
 export function getPackDir(packName) {
   return path.join(repoRoot, 'packs', String(packName));
 }

package/src/runtime/problem-artifacts.js

@@ -134,7 +134,7 @@ export function getProblemArtifactInventory(problem) {
           manifestPath: snapshot.manifestPath,
           indexPath: snapshot.indexPath,
           yamlPath: snapshot.yamlPath,
-          upstreamCommit: snapshot.manifest.upstream_commit ?? null,
+          upstreamCommit: snapshot.manifest.imported_commit ?? snapshot.manifest.upstream_commit ?? null,
           fetchedAt: snapshot.manifest.fetched_at,
         }
       : null,
@@ -263,7 +263,7 @@ export function scaffoldProblem(problem, destination) {
       `- Source: ${problem.sourceUrl}`,
       `- Repo status: ${problem.repoStatus}`,
       `- Harness depth: ${problem.harnessDepth}`,
-      `- Upstream record included: ${inventory.upstreamRecordIncluded ? 'yes' : 'no'}`,
+      `- Imported record included: ${inventory.upstreamRecordIncluded ? 'yes' : 'no'}`,
       `- Starter loop artifacts copied: ${copiedStarterArtifacts.length}`,
       `- Pack problem artifacts copied: ${packProblemArtifacts.length}`,
       `- Compute packets copied: ${computeArtifacts.length}`,

package/src/runtime/state.js

@@ -156,7 +156,7 @@ function deriveGenericProblemSummary(problem) {
     routeStory: activeRoute
       ? `Advance ${activeRoute} without blurring local route state into global problem status.`
       : 'No active route is recorded for this dossier yet.',
-    checkpointFocus: 'Keep dossier truth, upstream provenance, and local route state sharply separated.',
+    checkpointFocus: 'Keep dossier truth, import provenance, and local route state sharply separated.',
     nextHonestMove,
     packArtifacts: null,
     activeTicketId: null,

package/src/upstream/sync.js

@@ -17,9 +17,9 @@ import {
   getWorkspaceUpstreamYamlPath,
 } from '../runtime/paths.js';
 
-const UPSTREAM_REPO_URL = 'https://github.com/teorth/erdosproblems';
-const RAW_PROBLEMS_URL = 'https://raw.githubusercontent.com/teorth/erdosproblems/master/data/problems.yaml';
-const COMMIT_API_URL = 'https://api.github.com/repos/teorth/erdosproblems/commits?path=data/problems.yaml&per_page=1';
+const EXTERNAL_REPO_URL = 'https://github.com/teorth/erdosproblems';
+const EXTERNAL_RAW_PROBLEMS_URL = 'https://raw.githubusercontent.com/teorth/erdosproblems/master/data/problems.yaml';
+const EXTERNAL_COMMIT_API_URL = 'https://api.github.com/repos/teorth/erdosproblems/commits?path=data/problems.yaml&per_page=1';
 
 function sha256(text) {
   return crypto.createHash('sha256').update(text).digest('hex');
@@ -51,7 +51,7 @@ function normalizeUpstreamRecord(entry) {
 }
 
 async function fetchUpstreamCommit() {
-  const response = await fetch(COMMIT_API_URL, {
+  const response = await fetch(EXTERNAL_COMMIT_API_URL, {
     headers: {
       'User-Agent': 'erdos-problems-cli',
       Accept: 'application/vnd.github+json',
@@ -65,7 +65,7 @@ async function fetchUpstreamCommit() {
 }
 
 export async function fetchUpstreamSnapshot() {
-  const response = await fetch(RAW_PROBLEMS_URL, {
+  const response = await fetch(EXTERNAL_RAW_PROBLEMS_URL, {
     headers: {
       'User-Agent': 'erdos-problems-cli',
       Accept: 'text/plain',
@@ -79,11 +79,11 @@ export async function fetchUpstreamSnapshot() {
   const records = parsed.map(normalizeUpstreamRecord);
   const commit = await fetchUpstreamCommit();
   const manifest = {
-    upstream_repo: UPSTREAM_REPO_URL,
-    source_url: RAW_PROBLEMS_URL,
-    source_file: 'data/problems.yaml',
+    external_repo: EXTERNAL_REPO_URL,
+    external_source_url: EXTERNAL_RAW_PROBLEMS_URL,
+    external_source_file: 'data/problems.yaml',
     fetched_at: new Date().toISOString(),
-    upstream_commit: commit,
+    imported_commit: commit,
     raw_sha256: sha256(rawYaml),
     entry_count: records.length,
   };
@@ -154,7 +154,7 @@ function compareTagSets(localProblem, upstreamRecord) {
 export function buildUpstreamDiff() {
   const snapshot = loadActiveUpstreamSnapshot();
   if (!snapshot) {
-    throw new Error('No upstream snapshot available. Run `erdos upstream sync` first.');
+    throw new Error('No import snapshot available. Run `erdos import sync` first.');
   }
 
   const localProblems = loadLocalProblems();
@@ -170,7 +170,7 @@ export function buildUpstreamDiff() {
     }
 
     const statusMatches = normalizeStatus(problem.siteStatus) === normalizeStatus(upstream.status.state);
-    const formalizedMatches = normalizeStatus(problem.upstreamFormalizedState) === normalizeStatus(upstream.formalized.state);
+    const formalizedMatches = normalizeStatus(problem.importedFormalizedState) === normalizeStatus(upstream.formalized.state);
     const tagDiff = compareTagSets(problem, upstream);
 
     overlaps.push({
@@ -180,7 +180,7 @@ export function buildUpstreamDiff() {
       localSiteStatus: problem.siteStatus,
       upstreamSiteStatus: upstream.status.state,
       statusMatches,
-      localFormalized: problem.upstreamFormalizedState,
+      localFormalized: problem.importedFormalizedState,
       upstreamFormalized: upstream.formalized.state,
       formalizedMatches,
       localPrize: problem.prize,
@@ -207,20 +207,20 @@ export function buildUpstreamDiff() {
 
 export function renderUpstreamDiffMarkdown(diff) {
   const lines = [];
-  lines.push('# Upstream Diff');
+  lines.push('# External Atlas Diff');
   lines.push('');
   lines.push(`Snapshot kind: \
 ${diff.snapshot.kind}`.replace('\
 ', ''));
-  lines.push(`Upstream commit: ${diff.snapshot.manifest.upstream_commit ?? '(unknown)'}`);
+  lines.push(`Imported commit: ${diff.snapshot.manifest.imported_commit ?? '(unknown)'}`);
   lines.push(`Fetched at: ${diff.snapshot.manifest.fetched_at}`);
   lines.push(`Local seeded problems: ${diff.localProblemCount}`);
-  lines.push(`Upstream total problems: ${diff.upstreamProblemCount}`);
-  lines.push(`Upstream-only problems not yet locally seeded: ${diff.upstreamOnlyCount}`);
+  lines.push(`External atlas total problems: ${diff.upstreamProblemCount}`);
+  lines.push(`External-only problems not yet locally seeded: ${diff.upstreamOnlyCount}`);
   lines.push('');
   lines.push('## Overlap');
   lines.push('');
-  lines.push('| ID | Cluster | Local site | Upstream site | Status | Local formalized | Upstream formalized | Tags |');
+  lines.push('| ID | Cluster | Local site | External site | Status | Local formalized | Imported formalized | Tags |');
   lines.push('| --- | --- | --- | --- | --- | --- | --- | --- |');
   for (const row of diff.overlaps) {
     const status = row.statusMatches ? 'match' : 'DIFF';
@@ -235,7 +235,7 @@ ${diff.snapshot.kind}`.replace('\
     lines.push(`| ${row.problemId} | ${row.cluster} | ${row.localSiteStatus} | ${row.upstreamSiteStatus} | ${status} | ${row.localFormalized ?? '(unset)'} | ${row.upstreamFormalized ?? '(unset)'} | ${tagNotes.join('; ') || 'match'} |`);
   }
   lines.push('');
-  lines.push('## Upstream-Only Preview');
+  lines.push('## External-Only Preview');
   lines.push('');
   lines.push(diff.upstreamOnlyPreview.join(', ') || '(none)');
   lines.push('');