@easysociable/cli 0.1.7 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easysociable/cli",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Agent-first CLI for EasySociable: Content Engine, Template, Slideshow, and MCP",
   "type": "module",
   "license": "MIT",
@@ -33,7 +33,7 @@
     "bin",
     "dist",
     "skills",
-    "content-engine",
+    "scripts/engine",
     "LICENSE",
     "README.md"
   ],

package/scripts/engine/migrate-split-vault.py

@@ -0,0 +1,75 @@
+#!/usr/bin/env python3
+"""Split a mixed Content Engine folder into core + vault.
+
+Default layout after migration (next to your current engine):
+
+  <parent>/
+    content-engine-core/     # fresh clone; engine.json vault_root → ../<old-engine-name>
+    <old-engine-name>/       # becomes the vault (your data stays here)
+
+Usage:
+  python3 migrate-split-vault.py --engine "/path/to/Content Engine"
+  python3 migrate-split-vault.py --engine "/path/to/Content Engine" --core-name content-engine-core --yes
+
+Requires git + network (clones https://github.com/murphywuwu/content-engine.git).
+"""
+
+from __future__ import annotations
+
+import argparse
+import json
+import shutil
+import subprocess
+import sys
+from pathlib import Path
+
+REPO = "https://github.com/murphywuwu/content-engine.git"
+
+
+def main() -> int:
+    ap = argparse.ArgumentParser(description=__doc__)
+    ap.add_argument("--engine", required=True, help="Path to existing mixed Content Engine")
+    ap.add_argument("--core-name", default="content-engine-core", help="Sibling folder name for new core clone")
+    ap.add_argument("--repo", default=REPO)
+    ap.add_argument("--yes", action="store_true", help="Apply (otherwise dry-run)")
+    args = ap.parse_args()
+
+    engine = Path(args.engine).expanduser().resolve()
+    if not (engine / "CLAUDE.md").exists():
+        print(f"error: {engine} is not a Content Engine (missing CLAUDE.md)", file=sys.stderr)
+        return 2
+
+    parent = engine.parent
+    core = parent / args.core_name
+    rel_vault = Path("..") / engine.name
+
+    print(f"engine (vault): {engine}")
+    print(f"new core:       {core}")
+    print(f"vault_root:     {rel_vault.as_posix()}")
+    if core.exists():
+        print(f"error: {core} already exists", file=sys.stderr)
+        return 2
+
+    if not args.yes:
+        print("dry-run only. Re-run with --yes to clone core and write vault_root.")
+        return 0
+
+    subprocess.check_call(["git", "clone", "--depth", "1", args.repo, str(core)])
+    # Detach so users don't accidentally push private notes to the public remote.
+    shutil.rmtree(core / ".git", ignore_errors=True)
+
+    ej_path = core / "engine.json"
+    data = json.loads(ej_path.read_text(encoding="utf-8"))
+    data["vault_root"] = rel_vault.as_posix()
+    ej_path.write_text(json.dumps(data, indent=2) + "\n", encoding="utf-8")
+
+    print("done.")
+    print(f"  cd {core}")
+    print("  python3 workbench/build.py")
+    print("  python3 workbench/serve.py")
+    print("Data stays in the old folder; core only holds CLAUDE.md + workbench + templates.")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

package/skills/ONBOARDING.md

@@ -22,16 +22,30 @@ V1 expects an Agent (Grok Bot, Codex, Claude Code, …) to drive setup. The webs
    - `easysociable-slideshow` — turns a draft into slideshow pages you preview and download in the dashboard
    - `easysociable-template` — creates page templates
 
-   Optional Content Engine skill (pointer only — operations live in `Content Engine/CLAUDE.md`):
+   Optional Content Engine skill (install via CLI only — not in the public
+   content-engine git repo; operations still follow that engine’s `CLAUDE.md`):
 
    ```bash
    easysociable install --skills content,template,slideshow --yes
+   ```
+
+   Get a Content Engine core (preferred):
+
+   ```bash
+   git clone https://github.com/murphywuwu/content-engine.git
+   cd content-engine
+   python3 workbench/build.py
+   python3 workbench/serve.py --no-open
+   ```
+
+   See [LAYOUT.md](https://github.com/murphywuwu/content-engine/blob/main/LAYOUT.md).
+   Optional CLI clone into `Content Engine/`:
+
+   ```bash
    easysociable engine init --root /workspace --yes
    easysociable engine serve --engine /workspace/Content Engine --no-open
    ```
 
-   On a laptop, use any parent path instead of `/workspace` for `engine init` / `serve`.
-
 3. **Ask the Agent to create graphics** — account creation is deferred until a hosted operation requires authentication. If you installed the content skill: interview and write the profile first, then capture audience quotes into `needs/` (at least 3, aim for 5); do not create a slideshow yet.
 
 ## Lazy auth (Agent script)
@@ -56,7 +70,8 @@ idempotency key when applicable.
 ## What works without auth
 
 - `easysociable install` / `update`
-- `easysociable engine init` / `serve` / `build` / `validate`
+- `easysociable engine init` / `serve` / `build` / `validate` (optional; core may be copied from git)
+- Local `python3 workbench/build.py` / `serve.py` without CLI
 - Reading installed Skill instructions
 - Public template catalog in the browser (`/templates`)
 

package/skills/easysociable-content/SKILL.md

@@ -12,7 +12,8 @@ description: >
   — edit `recommendations/`; do not treat third-party subjects as owned Products.
   Triggers: 做成选题, 开一单, 出图
   — follow engine CLAUDE.md (§ Topics / § Open a run / § PagePack).
-  If no engine exists, run `easysociable engine init`. Then follow
+  If no engine exists, copy/clone the Content Engine core (see Create below;
+  `easysociable engine init` is optional offline scaffold). Then follow
   Content Engine/CLAUDE.md. Render handoff: easysociable-template (1 page) or
   easysociable-slideshow (2+). Never publish or post.
 ---
@@ -82,21 +83,36 @@ profile_thesis     = Profile + Pillar
 
 ## Create / serve / build
 
+**This skill** is installed only via EasySociable CLI (`easysociable install --skills content…`). It is **not** shipped inside the public Content Engine git repo.
+
+**Primary (public core — preferred):** clone the Content Engine repo, then run
+workbench from that folder. See `LAYOUT.md` (core vs vault; optional
+`engine.json` `vault_root`).
+
+```bash
+git clone https://github.com/murphywuwu/content-engine.git
+cd content-engine
+python3 workbench/build.py
+python3 workbench/serve.py --no-open
+```
+
+**Optional:** `easysociable engine init --root <parent> --yes` clones the same
+repo into `<parent>/Content Engine` (never overwrites an existing engine).
+
 ```bash
-easysociable engine init --root <parent-or-engine> --yes
 easysociable engine serve --engine <parent>/Content Engine --no-open
 easysociable engine build --engine <parent>/Content Engine
-# or, inside the vault:
-python3 workbench/build.py
+# --sync-workbench refreshes workbench files from the public core checkout
 ```
 
-On a dedicated agent computer (e.g. Grok Bot), prefer `--root /workspace`.
+On a dedicated agent computer (e.g. Grok Bot), prefer `/workspace` + clone or
+`engine init`. Mixed→split vault: see `scripts/migrate-split-vault.py` in the
+public repo.
 
-Existing files are never overwritten. `python3` is required for the workbench. Observatory: `http://127.0.0.1:8765/workbench/` — top tabs include **需求库 / Needs**. If `serve.py` is already up, do not start a second server; rebuild only.
+`python3` is required for the workbench. Observatory: `http://127.0.0.1:8765/workbench/` — top tabs include **需求库 / Needs**. If `serve.py` is already up, do not start a second server; rebuild only.
 
-`engine init` adds missing `products/` and `recommendations/` starter files to
-older vaults without overwriting user files. It does not invent recommendation
-entries or migrate existing product notes.
+Engine methodology updates: `git pull` on the core (or `--sync-workbench`), not
+CLI republishes.
 
 ## Operate
 

package/content-engine/scripts/fixture.test.mjs

@@ -1,24 +0,0 @@
-import assert from 'node:assert/strict'
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { spawnSync } from 'node:child_process'
-
-const root = new URL('..', import.meta.url).pathname
-const goldenRun = join(root, 'fixtures/golden-run-en')
-const validateRun = join(root, 'scripts/validate-run.mjs')
-const validatePack = join(root, 'scripts/validate-pack.mjs')
-
-const packFile = join(goldenRun, 'pack-tiktok.json')
-const packCli = spawnSync(process.execPath, [validatePack, '--file', packFile, '--platform', 'tiktok', '--json'], { encoding: 'utf8' })
-assert.equal(packCli.status, 0, packCli.stdout + packCli.stderr)
-
-const runCli = spawnSync(process.execPath, [validateRun, '--run', goldenRun, '--require-pack', '--json'], { encoding: 'utf8' })
-assert.equal(runCli.status, 0, runCli.stdout + runCli.stderr)
-const runReport = JSON.parse(runCli.stdout)
-assert.equal(runReport.valid, true)
-assert.equal(runReport.layout.frontmatter.status, 'pack-ready')
-
-const pack = JSON.parse(readFileSync(packFile, 'utf8'))
-assert.equal(pack.pages.length, 4)
-
-console.log('Golden fixture validation passed.')

package/content-engine/scripts/starter.mjs

@@ -1,58 +0,0 @@
-import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs'
-import { join, relative } from 'node:path'
-import { fileURLToPath } from 'node:url'
-
-export const ENGINE_ROOT = 'Content Engine'
-export const STARTER_DIR = fileURLToPath(new URL('../starter/', import.meta.url))
-export const WORKBENCH_SRC = fileURLToPath(new URL('../workbench/', import.meta.url))
-export const WORKBENCH_FILES = ['template.html', 'build.py', 'serve.py']
-
-export const ENGINE_PATHS = {
-  runs: 'runs',
-  exports: 'exports',
-  topics: 'topics',
-  needs: 'needs',
-  hits: 'hits',
-  products: 'products',
-  recommendations: 'recommendations',
-  swipe: 'swipe',
-  profiles: 'profiles',
-  inbox: 'inbox',
-  accounts: 'accounts',
-  raw: 'raw',
-  published: 'published',
-  wiki: 'wiki',
-  platforms: 'platforms',
-  workbench: 'workbench',
-}
-
-export function engineJson() {
-  return `${JSON.stringify({
-    schemaVersion: 'content-engine.v1',
-    locale: 'en',
-    root: ENGINE_ROOT,
-    paths: ENGINE_PATHS,
-  }, null, 2)}\n`
-}
-
-function walkFiles(dir) {
-  const out = []
-  if (!existsSync(dir)) return out
-  for (const name of readdirSync(dir)) {
-    if (name === '.DS_Store') continue
-    const path = join(dir, name)
-    if (statSync(path).isDirectory()) out.push(...walkFiles(path))
-    else out.push(path)
-  }
-  return out
-}
-
-export function filesFor() {
-  const files = {}
-  for (const path of walkFiles(STARTER_DIR)) {
-    const relativePath = relative(STARTER_DIR, path).split('\\').join('/')
-    files[relativePath] = readFileSync(path, 'utf8')
-  }
-  files['engine.json'] = engineJson()
-  return files
-}

package/content-engine/scripts/validate.test.mjs

@@ -1,101 +0,0 @@
-import assert from 'node:assert/strict'
-import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { spawnSync } from 'node:child_process'
-import { validateContentPack } from './contracts.mjs'
-import { validateExportDirectory } from './export-contracts.mjs'
-
-const root = new URL('.', import.meta.url).pathname
-const validatePack = join(root, 'validate-pack.mjs')
-const validateRun = join(root, 'validate-run.mjs')
-const fixture = mkdtempSync(join(tmpdir(), 'easysociable-validate-'))
-
-function run(script, args) {
-  return spawnSync(process.execPath, [script, ...args, '--json'], { encoding: 'utf8' })
-}
-
-function ideaMd({ platform = 'tiktok', status = 'pack-ready' } = {}) {
-  return `---
-run_id: RUN-demo
-status: ${status}
-created: 2026-08-28
----
-
-# Idea
-
-- **one_liner:** Demo
-- **primary_platform:** ${platform}
-- **platforms:** ${platform}
-- **swipe_id:** none
-- **atoms:** none
-- **claim_id:** none
-`
-}
-
-const tiktokPack = {
-  schemaVersion: 'content-pack.v1',
-  platform: 'tiktok',
-  title: 'Demo',
-  pages: [
-    { role: 'hook', pageTemplateId: 'tpl_hook', slots: { text_0: 'a' } },
-    { role: 'value', pageTemplateId: 'tpl_value', slots: { text_0: 'b' } },
-    { role: 'value', pageTemplateId: 'tpl_value', slots: { text_0: 'c' } },
-    { role: 'cta', pageTemplateId: 'tpl_cta', slots: { text_0: 'd' } },
-  ],
-}
-
-try {
-  const ok = validateContentPack(tiktokPack)
-  assert.equal(ok.valid, true)
-
-  const short = validateContentPack({ ...tiktokPack, pages: tiktokPack.pages.slice(0, 3) })
-  assert.equal(short.valid, false)
-
-  const forbidden = validateContentPack({ ...tiktokPack, deck_template_id: 'x' })
-  assert.equal(forbidden.valid, false)
-
-  const badSlot = validateContentPack({ ...tiktokPack, pages: [{ ...tiktokPack.pages[0], slots: { text_0: [] } }, ...tiktokPack.pages.slice(1)] })
-  assert.equal(badSlot.valid, false)
-
-  const missingTemplate = validateContentPack({ ...tiktokPack, pages: [{ role: 'hook', slots: {} }, ...tiktokPack.pages.slice(1)] })
-  assert.equal(missingTemplate.valid, false)
-
-  const packFile = join(fixture, 'pack-tiktok.json')
-  writeFileSync(packFile, JSON.stringify(tiktokPack), 'utf8')
-  const packCli = run(validatePack, ['--file', packFile, '--platform', 'tiktok'])
-  assert.equal(packCli.status, 0)
-
-  const runDir = join(fixture, 'demo-run')
-  mkdirSync(runDir)
-  writeFileSync(join(runDir, 'idea.md'), ideaMd(), 'utf8')
-  writeFileSync(join(runDir, 'draft.md'), '# Draft\n', 'utf8')
-  writeFileSync(join(runDir, 'pack-tiktok.json'), JSON.stringify(tiktokPack), 'utf8')
-
-  const runCli = run(validateRun, ['--run', runDir, '--require-pack'])
-  assert.equal(runCli.status, 0)
-  const runReport = JSON.parse(runCli.stdout)
-  assert.equal(runReport.valid, true)
-
-  rmSync(join(runDir, 'pack-tiktok.json'))
-  const missingPack = run(validateRun, ['--run', runDir, '--require-pack'])
-  assert.equal(missingPack.status, 2)
-
-  const exportDir = join(fixture, 'exported')
-  mkdirSync(exportDir)
-  writeFileSync(join(exportDir, '01.png'), Buffer.from('89504e470d0a1a0a', 'hex'))
-  writeFileSync(join(exportDir, 'manifest.json'), JSON.stringify({ schema: 'template-export.v1', artifacts: [{ pageIndex: 0 }] }))
-  assert.equal(validateExportDirectory(exportDir, { expectedPages: 1 }).valid, true)
-
-  const exportedRun = join(fixture, 'exported-run')
-  mkdirSync(exportedRun)
-  writeFileSync(join(exportedRun, 'idea.md'), ideaMd({ platform: 'x', status: 'exported' }), 'utf8')
-  writeFileSync(join(exportedRun, 'draft.md'), '# Draft\n', 'utf8')
-  const exportedCli = run(validateRun, ['--run', exportedRun, '--export', exportDir, '--require-export'])
-  assert.equal(exportedCli.status, 0, exportedCli.stdout)
-
-  console.log('Content Skill validate smoke passed.')
-}
-finally {
-  rmSync(fixture, { recursive: true, force: true })
-}

package/content-engine/scripts/workbench.mjs

@@ -1,140 +0,0 @@
-#!/usr/bin/env node
-
-import { spawn, spawnSync } from 'node:child_process'
-import { existsSync, mkdirSync, copyFileSync } from 'node:fs'
-import net from 'node:net'
-import { pathToFileURL } from 'node:url'
-import { join, resolve } from 'node:path'
-import { WORKBENCH_FILES, WORKBENCH_SRC } from './starter.mjs'
-
-export const WORKBENCH_PORT = 8765
-export const WORKBENCH_URL = `http://127.0.0.1:${WORKBENCH_PORT}/workbench/`
-
-function output(value, json) {
-  process.stdout.write(json ? `${JSON.stringify(value, null, 2)}\n` : `${value.message ?? value}\n`)
-}
-
-export function python3Bin() {
-  const result = spawnSync('python3', ['--version'], { encoding: 'utf8' })
-  if (result.status === 0) return 'python3'
-  return ''
-}
-
-export function portInUse(port = WORKBENCH_PORT) {
-  return new Promise((resolvePort) => {
-    const socket = net.connect({ port, host: '127.0.0.1' }, () => {
-      socket.end()
-      resolvePort(true)
-    })
-    socket.on('error', () => resolvePort(false))
-  })
-}
-
-/** `update: false` = init (missing only). `update: true` = build/serve refresh from package. */
-export function ensureWorkbench(engine, { update = false } = {}) {
-  const destDir = join(engine, 'workbench')
-  mkdirSync(destDir, { recursive: true })
-  const copied = []
-  const updated = []
-  const skipped = []
-  for (const name of WORKBENCH_FILES) {
-    const dest = join(destDir, name)
-    const from = join(WORKBENCH_SRC, name)
-    if (existsSync(dest) && !update) {
-      skipped.push(name)
-      continue
-    }
-    const existed = existsSync(dest)
-    copyFileSync(from, dest)
-    if (existed) updated.push(name)
-    else copied.push(name)
-  }
-  return { destDir, copied, updated, skipped }
-}
-
-export function buildWorkbench(engine) {
-  const python = python3Bin()
-  if (!python) {
-    return { ok: false, code: 'PYTHON3_REQUIRED', message: 'python3 is required for the workbench. Install Python 3 and retry.' }
-  }
-  const script = join(engine, 'workbench', 'build.py')
-  if (!existsSync(script)) {
-    return { ok: false, code: 'WORKBENCH_MISSING', message: 'workbench/build.py is missing. Re-run setup --apply.' }
-  }
-  const result = spawnSync(python, [script], { encoding: 'utf8', cwd: engine })
-  if (result.status !== 0) {
-    return { ok: false, code: 'WORKBENCH_BUILD_FAILED', message: result.stderr.trim() || result.stdout.trim() || 'workbench build failed' }
-  }
-  return { ok: true, message: result.stdout.trim() }
-}
-
-export async function startWorkbench(engine, { noOpen = false } = {}) {
-  const python = python3Bin()
-  if (!python) {
-    return { ok: false, code: 'PYTHON3_REQUIRED', message: 'python3 is required for the workbench. Install Python 3 and retry.' }
-  }
-  ensureWorkbench(engine, { update: true })
-  const built = buildWorkbench(engine)
-  if (!built.ok) return built
-  const url = WORKBENCH_URL
-  if (await portInUse()) {
-    if (!noOpen && process.env.EASYSOCIABLE_NO_OPEN !== 'true') openUrl(url)
-    return { ok: true, alreadyRunning: true, url, build: built.message }
-  }
-  const args = [join(engine, 'workbench', 'serve.py')]
-  if (noOpen) args.push('--no-open')
-  const child = spawn(python, args, { cwd: engine, detached: true, stdio: 'ignore' })
-  child.unref()
-  return { ok: true, alreadyRunning: false, url, pid: child.pid, build: built.message }
-}
-
-function openUrl(url) {
-  const command = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'cmd' : 'xdg-open'
-  const args = process.platform === 'win32' ? ['/c', 'start', url] : [url]
-  spawn(command, args, { stdio: 'ignore', detached: true }).unref()
-}
-
-function parseArgs(argv) {
-  const options = { engine: '', command: '', noOpen: false, json: false }
-  for (let i = 0; i < argv.length; i += 1) {
-    const arg = argv[i]
-    if (arg === '--engine') options.engine = argv[++i] ?? ''
-    else if (arg === '--no-open') options.noOpen = true
-    else if (arg === '--json') options.json = true
-    else if (arg === '--help' || arg === '-h') options.help = true
-    else if (!arg.startsWith('--') && !options.command) options.command = arg
-    else throw new Error(`Unknown argument: ${arg}`)
-  }
-  return options
-}
-
-async function main() {
-  const options = parseArgs(process.argv.slice(2))
-  if (options.help) {
-    output({ usage: 'node workbench.mjs build|start --engine <Content Engine> [--no-open] [--json]' }, false)
-    return
-  }
-  if (!options.engine) throw new Error('--engine is required')
-  const engine = resolve(options.engine)
-  if (options.command === 'build') {
-    const workbench = ensureWorkbench(engine, { update: true })
-    const built = buildWorkbench(engine)
-    output({ workbench, ...built }, options.json)
-    if (!built.ok) process.exitCode = 2
-    return
-  }
-  if (options.command === 'start' || options.command === '') {
-    const started = await startWorkbench(engine, { noOpen: options.noOpen })
-    output(started, options.json)
-    if (!started.ok) process.exitCode = 2
-    return
-  }
-  throw new Error('Command must be build or start')
-}
-
-if (process.argv[1] && import.meta.url === pathToFileURL(resolve(process.argv[1])).href) {
-  main().catch((error) => {
-    output({ code: 'WORKBENCH_FAILED', message: error instanceof Error ? error.message : String(error) }, true)
-    process.exitCode = 1
-  })
-}