prizmkit 1.1.112 → 1.1.114

package/src/scaffold.js

@@ -27,7 +27,7 @@ import {
 } from './metadata.js';
 import { generateGitignore } from './gitignore-template.js';
 import { buildManifest, writeManifest } from './manifest.js';
-import { defaultCliForPlatform, expandPlatforms, isKnownPlatform, platformLabel, projectMemoryFile, resolvePayloadPlatforms } from './platforms.js';
+import { defaultCliForPlatform, expandPlatforms, isKnownPlatform, platformLabel, privateProjectMemoryFile, privateProjectMemoryFiles, projectMemoryFile, resolvePayloadPlatforms } from './platforms.js';
 import { normalizeRuntime, runtimeLabel } from './runtimes.js';
 import { applyAiCliLaunchToConfig, resolveAiCliLaunchSelection } from './ai-cli-launch.js';
 
@@ -869,20 +869,175 @@ export async function installPrizmkitScripts(projectRoot, dryRun, runtime = 'pyt
 const PRIZMKIT_MARKER_START = '<!-- PRIZMKIT:START';
 const PRIZMKIT_MARKER_END = '<!-- PRIZMKIT:END -->';
 
+function extendManagedBlockEnd(content, endIdx) {
+  if (content.slice(endIdx, endIdx + 2) === '\r\n') return endIdx + 2;
+  if (content[endIdx] === '\n' || content[endIdx] === '\r') return endIdx + 1;
+  return endIdx;
+}
+
+function markerPositions(content, marker) {
+  const positions = [];
+  let cursor = 0;
+  while (cursor < content.length) {
+    const idx = content.indexOf(marker, cursor);
+    if (idx === -1) break;
+    positions.push(idx);
+    cursor = idx + marker.length;
+  }
+  return positions;
+}
+
+function positionInBlocks(position, blocks) {
+  return blocks.some(block => position >= block.start && position < block.end);
+}
+
+export function analyzeManagedProjectMemoryBlocks(content) {
+  const blocks = [];
+  const warnings = new Set();
+  let cursor = 0;
+
+  while (cursor < content.length) {
+    const startIdx = content.indexOf(PRIZMKIT_MARKER_START, cursor);
+    if (startIdx === -1) break;
+
+    const nextStartIdx = content.indexOf(PRIZMKIT_MARKER_START, startIdx + PRIZMKIT_MARKER_START.length);
+    const endMarkerIdx = content.indexOf(PRIZMKIT_MARKER_END, startIdx + PRIZMKIT_MARKER_START.length);
+
+    if (endMarkerIdx === -1) {
+      warnings.add('PRIZMKIT:START without PRIZMKIT:END');
+      cursor = startIdx + PRIZMKIT_MARKER_START.length;
+      continue;
+    }
+
+    if (nextStartIdx !== -1 && nextStartIdx < endMarkerIdx) {
+      warnings.add('nested PRIZMKIT:START before PRIZMKIT:END');
+      cursor = endMarkerIdx + PRIZMKIT_MARKER_END.length;
+      continue;
+    }
+
+    const rawEnd = endMarkerIdx + PRIZMKIT_MARKER_END.length;
+    const blockEnd = extendManagedBlockEnd(content, rawEnd);
+    blocks.push({
+      start: startIdx,
+      end: blockEnd,
+      text: content.slice(startIdx, blockEnd),
+    });
+    cursor = blockEnd;
+  }
+
+  for (const endIdx of markerPositions(content, PRIZMKIT_MARKER_END)) {
+    if (!positionInBlocks(endIdx, blocks)) {
+      warnings.add('PRIZMKIT:END without matching PRIZMKIT:START');
+    }
+  }
+
+  return { blocks, warnings: [...warnings] };
+}
+
+export function removeManagedProjectMemoryBlocks(content) {
+  const analysis = analyzeManagedProjectMemoryBlocks(content);
+  if (!analysis.blocks.length) {
+    return { content, removedBlocks: [], warnings: analysis.warnings };
+  }
+
+  let cursor = 0;
+  let nextContent = '';
+  for (const block of analysis.blocks) {
+    nextContent += content.slice(cursor, block.start);
+    cursor = block.end;
+  }
+  nextContent += content.slice(cursor);
+
+  return {
+    content: nextContent.replace(/\n{3,}/g, '\n\n'),
+    removedBlocks: analysis.blocks.map(block => block.text),
+    warnings: analysis.warnings,
+  };
+}
+
+export function normalizeMainProjectMemoryContent(content, privateFile) {
+  const removal = removeManagedProjectMemoryBlocks(content);
+  const importPointer = privateFile ? `@./${privateFile}` : null;
+  const nextContent = removal.content
+    .split(/\r?\n/)
+    .filter(line => !importPointer || line.trim() !== importPointer)
+    .join('\n')
+    .replace(/\n{3,}/g, '\n\n')
+    .trimEnd();
+
+  return {
+    content: nextContent,
+    removedBlocks: removal.removedBlocks,
+    warnings: removal.warnings,
+  };
+}
+
+function mergeManagedProjectMemoryBlock(existing, templateContent) {
+  const analysis = analyzeManagedProjectMemoryBlocks(existing);
+
+  if (analysis.blocks.length) {
+    let cursor = 0;
+    let merged = '';
+    let inserted = false;
+    for (const block of analysis.blocks) {
+      merged += existing.slice(cursor, block.start);
+      if (!inserted) {
+        merged += `${templateContent}\n`;
+        inserted = true;
+      }
+      cursor = block.end;
+    }
+    merged += existing.slice(cursor);
+    logManagedProjectMemoryWarnings('private memory', analysis.warnings);
+    return merged.replace(/\n{3,}/g, '\n\n').trimEnd() + '\n';
+  }
+
+  const trimmed = existing.trimEnd();
+  if (analysis.warnings.length) {
+    logManagedProjectMemoryWarnings('private memory', analysis.warnings);
+    if (trimmed.includes(templateContent)) return `${trimmed}\n`;
+  }
+  if (!trimmed) return `${templateContent}\n`;
+
+  return `${trimmed}\n\n${templateContent}\n`;
+}
+
+function ensureSingleImportPointer(existing, importPointer) {
+  const cleaned = removeManagedProjectMemoryBlocks(existing);
+  const lines = cleaned.content.split(/\r?\n/).filter(line => line.trim() !== importPointer);
+  const base = lines.join('\n').replace(/\n{3,}/g, '\n\n').trimEnd();
+  const content = base ? `${base}\n\n${importPointer}\n` : `${importPointer}\n`;
+  return {
+    content,
+    removedBlocks: cleaned.removedBlocks,
+    warnings: cleaned.warnings,
+  };
+}
+
+function logManagedProjectMemoryWarnings(memoryFile, warnings) {
+  for (const warning of warnings) {
+    console.log(chalk.yellow(`      ⚠ ${memoryFile}: ${warning}; preserving unmatched marker content`));
+  }
+}
+
 /**
- * Merge PrizmKit template content into a project memory file.
- * - File missing → create with template content
- * - File exists with markers → replace content between markers
- * - File exists without markers → append template content
+ * Install PrizmKit framework memory as a private imported file.
+ * - Private file missing → create with managed template content
+ * - Private file exists with markers → replace content between markers
+ * - Private file exists without markers → append managed template content
+ * - Main memory file stays user-owned and contains exactly one import pointer
  */
 export async function installProjectMemory(platform, projectRoot, dryRun) {
   const templatesDir = getTemplatesDir();
   const templateName = 'project-memory-template.md';
-  const targetName = projectMemoryFile(platform);
-  if (!targetName) return;
-  const targetPath = path.join(projectRoot, targetName);
+  const mainName = projectMemoryFile(platform);
+  const privateName = privateProjectMemoryFile(platform);
+  if (!mainName || !privateName) return;
+
+  const mainPath = path.join(projectRoot, mainName);
+  const privatePath = path.join(projectRoot, privateName);
+  const importPointer = `@./${privateName}`;
 
-  // Template lives in core/templates/ (bundled as templates/).
   const templateCandidates = [
     path.join(templatesDir, templateName),
   ];
@@ -908,34 +1063,37 @@ Codex discovers repository skills from \`.agents/skills/\`. When a user or promp
   }
 
   if (dryRun) {
-    console.log(chalk.gray(`      [dry-run] ${targetName}`));
+    console.log(chalk.gray(`      [dry-run] ${privateName}`));
+    console.log(chalk.gray(`      [dry-run] ${mainName} import ${importPointer}`));
     return;
   }
 
-  if (!await fs.pathExists(targetPath)) {
-    // File doesn't exist — create with template content
-    await fs.writeFile(targetPath, templateContent + '\n', 'utf-8');
-    console.log(chalk.green(`      ✓ ${targetName} (created)`));
-    return;
+  if (!await fs.pathExists(privatePath)) {
+    await fs.writeFile(privatePath, `${templateContent}\n`, 'utf-8');
+    console.log(chalk.green(`      ✓ ${privateName} (created PrizmKit section)`));
+  } else {
+    const existingPrivate = await fs.readFile(privatePath, 'utf-8');
+    const mergedPrivate = mergeManagedProjectMemoryBlock(existingPrivate, templateContent);
+    if (mergedPrivate !== existingPrivate) {
+      await fs.writeFile(privatePath, mergedPrivate, 'utf-8');
+      console.log(chalk.green(`      ✓ ${privateName} (updated PrizmKit section)`));
+    } else {
+      console.log(chalk.green(`      ✓ ${privateName} (up-to-date)`));
+    }
   }
 
-  // File exists — merge via markers
-  const existing = await fs.readFile(targetPath, 'utf-8');
-  const startIdx = existing.indexOf(PRIZMKIT_MARKER_START);
-  const endIdx = existing.indexOf(PRIZMKIT_MARKER_END);
-
-  if (startIdx !== -1 && endIdx !== -1 && endIdx > startIdx) {
-    // Replace content between markers (inclusive)
-    const before = existing.substring(0, startIdx);
-    const after = existing.substring(endIdx + PRIZMKIT_MARKER_END.length);
-    const merged = before + templateContent + after;
-    await fs.writeFile(targetPath, merged, 'utf-8');
-    console.log(chalk.green(`      ✓ ${targetName} (updated PrizmKit section)`));
+  const existingMain = await fs.pathExists(mainPath)
+    ? await fs.readFile(mainPath, 'utf-8')
+    : '';
+  const mainMerge = ensureSingleImportPointer(existingMain, importPointer);
+  logManagedProjectMemoryWarnings(mainName, mainMerge.warnings);
+  const nextMain = mainMerge.content;
+  if (nextMain !== existingMain) {
+    await fs.writeFile(mainPath, nextMain, 'utf-8');
+    const migrationSuffix = mainMerge.removedBlocks.length ? ' and migrated managed block' : '';
+    console.log(chalk.green(`      ✓ ${mainName} (imports ${privateName}${migrationSuffix})`));
   } else {
-    // No markers found — append template content
-    const separator = existing.endsWith('\n') ? '\n' : '\n\n';
-    await fs.writeFile(targetPath, existing + separator + templateContent + '\n', 'utf-8');
-    console.log(chalk.green(`      ✓ ${targetName} (appended PrizmKit section)`));
+    console.log(chalk.green(`      ✓ ${mainName} (import up-to-date)`));
   }
 }
 
@@ -1166,9 +1324,12 @@ export async function installPipeline(projectRoot, dryRun, options = {}) {
 /**
  * 生成 .gitignore
  */
-export async function installGitignore(projectRoot, options, dryRun) {
+export async function installGitignore(projectRoot, options = {}, dryRun) {
   const targetPath = path.join(projectRoot, '.gitignore');
-  const templateContent = generateGitignore({ pipeline: options.pipeline });
+  const templateContent = generateGitignore({
+    pipeline: options.pipeline,
+    privateMemoryFiles: options.privateMemoryFiles || [],
+  });
 
   if (dryRun) {
     console.log(chalk.gray(`      [dry-run] .gitignore`));
@@ -1496,7 +1657,10 @@ export async function scaffold(config) {
 
   // 7. .gitignore
   console.log(chalk.blue('    项目配置:'));
-  await installGitignore(projectRoot, { pipeline }, dryRun);
+  await installGitignore(projectRoot, {
+    pipeline,
+    privateMemoryFiles: privateProjectMemoryFiles(payloadPlatforms),
+  }, dryRun);
 
   // 8. 写入 .prizmkit/config.json（如果指定了 aiCli）
   if (resolvedAiCli) {

package/src/upgrade.js

@@ -35,7 +35,7 @@ import {
   resolveSkillList,
   EXTRAS_REGISTRY,
 } from './scaffold.js';
-import { platformLabel, resolvePayloadPlatforms } from './platforms.js';
+import { platformLabel, privateProjectMemoryFiles, resolvePayloadPlatforms } from './platforms.js';
 import { normalizeRuntime, runtimeLabel } from './runtimes.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -432,7 +432,10 @@ export async function runUpgrade(directory, options = {}) {
 
   // .gitignore
   console.log(chalk.blue('    Gitignore:'));
-  await installGitignore(projectRoot, { pipeline }, dryRun);
+  await installGitignore(projectRoot, {
+    pipeline,
+    privateMemoryFiles: privateProjectMemoryFiles(payloadPlatforms),
+  }, dryRun);
 
   // PrizmKit scripts
   console.log(chalk.blue('    PrizmKit Scripts:'));