@easysociable/cli 0.1.28 → 0.1.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easysociable/cli",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "mcpName": "io.github.murphywuwu/easysociable-mcp",
   "description": "Agent-first CLI for EasySociable: Content Engine, Template, Slideshow, and MCP",
   "type": "module",

package/scripts/engine/contracts.mjs

@@ -10,7 +10,7 @@ export const PAGE_ROLES = [
 
 export const PACK_PLATFORMS = ['tiktok', 'xiaohongshu', 'instagram', 'linkedin', 'threads']
 
-export const SLIDESHOW_PLATFORMS = ['tiktok', 'instagram', 'linkedin', 'threads']
+export const SLIDESHOW_PLATFORMS = PACK_PLATFORMS
 
 export const PLATFORM_CAPS = {
   tiktok: { hardMin: 4, hardMax: 35 },
@@ -22,8 +22,8 @@ export const PLATFORM_CAPS = {
 
 const FORBIDDEN_PACK_KEYS = ['deck_template_id', 'deckTemplateId']
 
-const PACK_KEYS = new Set(['schemaVersion', 'platform', 'title', 'pages'])
-const PAGE_KEYS = new Set(['layoutFamilyId', 'pageTemplateId', 'role', 'slots'])
+const PACK_KEYS = new Set(['schemaVersion', 'platform', 'title', 'contentSlug', 'pages'])
+const PAGE_KEYS = new Set(['layoutFamilyId', 'pageTemplateId', 'layout', 'role', 'slots'])
 export const RUN_FILE_STATUSES = [
   'RUN_OPEN', 'BRIEF_WAIT', 'DRAFTED', 'EDIT_WAIT', 'SCORED',
   'READY_TO_POST', 'PUBLISHED', 'HOLD', 'KILLED', 'SUPERSEDED',
@@ -98,8 +98,14 @@ export function validateContentPack(pack, options = {}) {
     pushUnknownKeys(errors, page, PAGE_KEYS, label)
     if (!PAGE_ROLES.includes(page.role)) errors.push(`${label}.role: invalid page role`)
     const layoutRef = page.layoutFamilyId ?? page.pageTemplateId
-    if (typeof layoutRef !== 'string' || layoutRef.length === 0) {
-      errors.push(`${label}.layoutFamilyId: required (or pageTemplateId) and must be a non-empty string`)
+    if (page.layout !== undefined) {
+      // Agent-generated page: its own Studio source on the pack platform's canvas.
+      const { studioJson, canvas } = isRecord(page.layout) ? page.layout : {}
+      if (typeof studioJson !== 'string' || !studioJson || !isRecord(canvas) || !Number.isInteger(canvas.width) || !Number.isInteger(canvas.height))
+        errors.push(`${label}.layout: needs studioJson and canvas { width, height }`)
+    }
+    else if (typeof layoutRef !== 'string' || layoutRef.length === 0) {
+      errors.push(`${label}.layoutFamilyId: required (or pageTemplateId, or a generated layout) and must be a non-empty string`)
     }
     if (!isRecord(page.slots)) {
       errors.push(`${label}.slots: must be an object`)
@@ -137,47 +143,59 @@ export function ideaField(text, name) {
   return match ? match[1].trim() : ''
 }
 
+/**
+ * A Run folder in either layout:
+ * - current (Formula-led): content.md with run_id/platform/status frontmatter; the pack is pack.json,
+ *   pack-<platform>.json, or the JSON block under content.md "## Pack".
+ * - legacy (idea → draft → pack): idea.md + draft.md + pack-<platform>.json.
+ */
 export function validateRunLayout(runDir, options = {}) {
   const { requirePack = false } = options
   const errors = []
   const warnings = []
-  const files = { ideaMd: false, draftMd: false, packMd: false, packs: [] }
-  const ideaPath = join(runDir, 'idea.md')
+  const files = { contentMd: false, ideaMd: false, draftMd: false, packMd: false, packs: [] }
 
   if (!existsSync(runDir) || !statSync(runDir).isDirectory()) {
     errors.push('run: directory required')
     return { valid: false, errors, warnings, files, frontmatter: {} }
   }
-  if (!existsSync(ideaPath)) {
-    errors.push('idea.md: required')
+  files.contentMd = existsSync(join(runDir, 'content.md'))
+  files.ideaMd = existsSync(join(runDir, 'idea.md'))
+  const main = files.contentMd ? 'content.md' : files.ideaMd ? 'idea.md' : ''
+  if (!main) {
+    errors.push('content.md: required (or idea.md for a legacy run)')
     return { valid: false, errors, warnings, files, frontmatter: {} }
   }
 
-  files.ideaMd = true
-  const ideaText = readFileSync(ideaPath, 'utf8')
-  const frontmatter = parseFrontmatter(ideaText)
-  const platform = (frontmatter.platform || ideaField(ideaText, 'primary_platform') || ideaField(ideaText, 'platforms')).replace(/\s.*/, '')
+  const mainText = readFileSync(join(runDir, main), 'utf8')
+  const frontmatter = parseFrontmatter(mainText)
+  const platform = (frontmatter.platform || ideaField(mainText, 'primary_platform') || ideaField(mainText, 'platforms')).replace(/\s.*/, '')
   frontmatter.platform = platform
   frontmatter.slug = frontmatter.slug || basename(runDir)
-  if (!frontmatter.run_id) errors.push('idea.md frontmatter: missing run_id')
-  if (!frontmatter.status) errors.push('idea.md frontmatter: missing status')
+  if (!frontmatter.run_id) errors.push(`${main} frontmatter: missing run_id`)
+  if (!frontmatter.status) errors.push(`${main} frontmatter: missing status`)
   if (frontmatter.status && !RUN_STATUSES.includes(frontmatter.status)) {
-    errors.push(`idea.md status: must be one of the engine run statuses`)
+    errors.push(`${main} status: must be one of the engine run statuses`)
   }
-  if (!platform) warnings.push('idea.md: primary_platform recommended')
+  if (!platform) warnings.push(`${main}: platform recommended`)
 
-  files.draftMd = existsSync(join(runDir, 'draft.md'))
+  if (!files.contentMd) {
+    files.draftMd = existsSync(join(runDir, 'draft.md'))
+    if (!files.draftMd) warnings.push('draft.md: recommended')
+  }
   files.packMd = existsSync(join(runDir, 'pack.md')) || readdirSync(runDir).some((name) => /^pack-[a-z0-9_-]+\.md$/i.test(name))
-  if (!files.draftMd) warnings.push('draft.md: recommended')
 
-  files.packs = readdirSync(runDir).filter((name) => /^pack-[a-z0-9_-]+\.json$/i.test(name))
+  files.packs = readdirSync(runDir).filter((name) => /^pack(-[a-z0-9_-]+)?\.json$/i.test(name))
+  // content.md may carry the pack inline under "## Pack" instead of a file.
+  const inline = files.contentMd ? mainText.match(/^## Pack\b[\s\S]*?```json\s*\n([\s\S]*?)\n```/m) : null
+  if (inline) files.inlinePack = inline[1]
   const slideshowRun = SLIDESHOW_PLATFORMS.includes(platform) || platform === 'ig'
   const expectedPack = platform === 'ig' ? 'pack-instagram.json' : (platform ? `pack-${platform}.json` : 'pack-<platform>.json')
-  if (requirePack && files.packs.length === 0) {
-    errors.push(`${expectedPack}: required for slideshow handoff`)
+  if (requirePack && files.packs.length === 0 && !inline) {
+    errors.push(`${expectedPack} (or pack.json, or a json block under content.md ## Pack): required for slideshow handoff`)
   }
-  if (!slideshowRun && files.packs.length > 0) {
-    errors.push('pack-<platform>.json: only slideshow platforms may contain a Content Pack')
+  if (!slideshowRun && (files.packs.length > 0 || inline)) {
+    errors.push('pack: only slideshow platforms may contain a Content Pack')
   }
 
   return { valid: errors.length === 0, errors, warnings, files, frontmatter }

package/scripts/engine/validate-run.mjs

@@ -39,10 +39,13 @@ try {
     const runDir = resolve(options.run)
     const layout = validateRunLayout(runDir, { requirePack: options.requirePack })
     const packs = []
-    for (const name of layout.files.packs) {
-      const platform = name.replace(/^pack-/, '').replace(/\.json$/i, '')
+    const sources = layout.files.packs.map(name => ({ name, read: () => readFileSync(join(runDir, name), 'utf8') }))
+    if (layout.files.inlinePack) sources.push({ name: 'content.md ## Pack', read: () => layout.files.inlinePack })
+    for (const { name, read } of sources) {
+      // pack-<platform>.json names its platform; pack.json and the inline block follow the Run's.
+      const platform = /^pack-/.test(name) ? name.replace(/^pack-/, '').replace(/\.json$/i, '') : layout.frontmatter.platform || undefined
       try {
-        const pack = JSON.parse(readFileSync(join(runDir, name), 'utf8'))
+        const pack = JSON.parse(read())
         packs.push({ file: name, pages: Array.isArray(pack.pages) ? pack.pages.length : 0, ...validateContentPack(pack, {
           requirePageTemplateId: options.requirePageTemplateId,
           platform,