@hiveku-apps/sync 0.1.0 → 0.3.0

package/src/init.mjs

@@ -7,9 +7,10 @@
 
 import { existsSync } from 'node:fs';
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
-import { dirname, join, resolve } from 'node:path';
+import { basename, dirname, join, resolve } from 'node:path';
 
-import { writeFileAtomic, safeSlug, TYPE_TO_FOLDER } from './util.mjs';
+import { writeFileAtomic, safeSlug, TYPE_TO_FOLDER, loadDotenv } from './util.mjs';
+import { writeCodexScaffold, preTrustFolder } from './codex.mjs';
 
 const VALID_PROFILES = ['full', 'sales', 'marketing', 'helpdesk', 'pm', 'dev'];
 const DEFAULT_BASE_URL = 'https://core.hiveku.com';
@@ -148,7 +149,7 @@ async function appendToWorkspaceFile(workspaceFilePath, folderRelPath) {
   return true;
 }
 
-export async function runInit({ slug, parentDir, profile = 'full' }) {
+export async function runInit({ slug, parentDir, profile = 'full', codex = false, trust = false }) {
   if (!slug) throw new Error('slug is required, e.g. hiveku-sync init acme-corp');
   if (!VALID_PROFILES.includes(profile)) {
     throw new Error(
@@ -190,5 +191,36 @@ export async function runInit({ slug, parentDir, profile = 'full' }) {
     `./${safe}`,
   );
 
-  return { folder, slug: safe, profile, workspaceAdded };
+  // Optional Codex lane: AGENTS.md + .codex/config.toml + knowledge→skills, so
+  // the same folder works from the Codex CLI / IDE / ChatGPT desktop too.
+  let codexResult = null;
+  if (codex) {
+    codexResult = await writeCodexScaffold({
+      folder,
+      slug: safe,
+      baseUrl: DEFAULT_BASE_URL,
+      profile,
+    });
+    if (trust) codexResult.trust = await preTrustFolder(folder);
+  }
+
+  return { folder, slug: safe, profile, workspaceAdded, codex: codexResult };
+}
+
+/**
+ * Retrofit an EXISTING account folder with the Codex lane (AGENTS.md +
+ * .codex/config.toml + knowledge→skills). Run from inside the folder, or pass
+ * one. Derives the account slug from the folder name and the profile from
+ * .env (HIVEKU_PROFILE), and inlines the real OLYMPUS_API_KEY when .env has it.
+ */
+export async function runCodex({ folder, trust = false } = {}) {
+  const target = folder ? resolve(folder) : process.cwd();
+  if (!existsSync(target)) throw new Error(`Folder not found: ${target}`);
+  const dotenv = await loadDotenv(join(target, '.env'));
+  const profile = dotenv.HIVEKU_PROFILE || 'full';
+  const baseUrl = dotenv.OLYMPUS_BASE_URL || DEFAULT_BASE_URL;
+  const slug = safeSlug(basename(target));
+  const result = await writeCodexScaffold({ folder: target, slug, baseUrl, profile });
+  if (trust) result.trust = await preTrustFolder(target);
+  return { folder: target, slug, profile, ...result };
 }

package/src/projects.mjs

@@ -19,8 +19,11 @@ import {
   writeFileAtomic,
   readJson,
 } from './util.mjs';
+// NOTE: push.mjs imports helpers from this module; the cycle is safe because
+// both sides reference the imports only inside functions (never at module eval).
+import { computePushPlan } from './push.mjs';
 
-const PROJECTS_DIR = 'projects';
+export const PROJECTS_DIR = 'projects';
 const PROJECTS_MANIFEST = '.hiveku/projects.json';
 
 const IGNORE_DIRS = new Set([
@@ -46,11 +49,11 @@ const RUN_HINTS = {
   static: 'npx serve .',
 };
 
-function sha256(content) {
+export function sha256(content) {
   return createHash('sha256').update(content).digest('hex');
 }
 
-async function clientFromCwd({ profileOverride } = {}) {
+export async function clientFromCwd({ profileOverride } = {}) {
   const baseDir = process.cwd();
   const dotenv = await loadDotenv(join(baseDir, '.env'));
   const apiKey = readEnv(process.env, dotenv, 'OLYMPUS_API_KEY');
@@ -86,7 +89,7 @@ async function listAllRemoteFiles(client, projectId) {
   return all;
 }
 
-async function walkLocalFiles(rootDir) {
+export async function walkLocalFiles(rootDir) {
   const out = [];
   async function recurse(dir) {
     let entries;
@@ -125,16 +128,16 @@ function runHintForProjectType(type) {
   return RUN_HINTS[type] || `# Unknown project_type "${type}". Inspect package.json/requirements.txt to find the dev command.`;
 }
 
-async function readProjectsManifest(baseDir) {
+export async function readProjectsManifest(baseDir) {
   const data = await readJson(join(baseDir, PROJECTS_MANIFEST));
   return data && typeof data === 'object' ? data : { projects: {} };
 }
 
-async function writeProjectsManifest(baseDir, manifest) {
+export async function writeProjectsManifest(baseDir, manifest) {
   await writeFileAtomic(join(baseDir, PROJECTS_MANIFEST), JSON.stringify(manifest, null, 2));
 }
 
-async function resolveProject(client, slugOrId) {
+export async function resolveProject(client, slugOrId) {
   // Accept either UUID (use directly) or slug (look up via list_projects).
   const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
   if (UUID_RE.test(slugOrId)) {
@@ -227,19 +230,22 @@ export async function runPullProject({ slugOrId, profile, branch }) {
     runHintForProjectType(project.project_type),
     '```',
     '',
-    '## Commit changes back',
+    '## Ship changes back',
     '',
-    'This folder is NOT a git clone — it\'s a snapshot. Use the Hiveku MCP `project_commit` tool',
-    'to write edits back to the project\'s GitHub branch (same path the v3 sidebar uses).',
+    "This folder is NOT a git clone — it's a snapshot. `push` writes your edits to the",
+    'DEPLOY SOURCE (what `deploy` builds from), lane-routing images/fonts/video to the',
+    'S3/CDN asset store and everything else to versioned code files.',
     '',
     'From this folder:',
     '',
     '```bash',
-    `hiveku-sync status   # diff local vs remote`,
-    `hiveku-sync push -m "your message"   # save + commit changed files via MCP`,
+    'hiveku-sync pull-env                          # project secrets → .env.local',
+    'hiveku-sync status                            # diff local vs the deploy source',
+    'hiveku-sync push                              # save changes back',
+    'hiveku-sync push --deploy development --wait  # ...then deploy and wait',
     '```',
     '',
-    'Or ask Claude in this workspace to commit the changed files for you.',
+    'Or ask Claude in this workspace to push/deploy for you.',
     '',
   ]
     .filter((line) => line !== undefined)
@@ -263,7 +269,7 @@ export async function runPullProject({ slugOrId, profile, branch }) {
   return { dest, written, skipped, projectId, slug: localSlug };
 }
 
-async function findProjectFolder({ slug, baseDir }) {
+export async function findProjectFolder({ slug, baseDir }) {
   // Allow status/push to be called from inside ./projects/<slug>/, ./<slug>/,
   // or the account root with an explicit slug arg.
   const manifest = await readProjectsManifest(baseDir);
@@ -310,39 +316,68 @@ export async function runProjectStatus({ slug, profile, json = false }) {
     throw new Error(`Project folder ${folder} doesn't exist — run pull-project first.`);
   }
 
-  const localManifest = await buildLocalManifest(folder);
-  const diff = (await client.callToolJson('project_files_status', {
-    project_id: info.project_id,
-    local: localManifest,
-  })).data;
+  // Deploy-source-accurate + asset-lane-aware — the SAME diff `push` runs, so
+  // status never flags unchanged images as only_local (code goes through
+  // project_files_status; assets through assets_list).
+  const { diff, assetAll, assetToUpload, assetSkipped, plan } = await computePushPlan({
+    client,
+    projectId: info.project_id,
+    folder,
+    includeDeletes: true,
+  });
 
   if (json) {
-    console.log(JSON.stringify({ slug: resolvedSlug, project_id: info.project_id, ...diff }, null, 2));
-    return diff;
+    console.log(
+      JSON.stringify(
+        {
+          slug: resolvedSlug,
+          project_id: info.project_id,
+          code: diff,
+          assets: {
+            to_upload: assetToUpload.map((f) => f.path),
+            unchanged: assetSkipped,
+            total_local: assetAll.length,
+          },
+          plan,
+        },
+        null,
+        2,
+      ),
+    );
+    return { diff, plan };
   }
 
-  const sum = summarizeDiff(diff);
+  const changed = diff.changed?.length || 0;
+  const onlyLocal = diff.only_local?.length || 0;
+  const onlyRemote = diff.only_remote?.length || 0;
+  const unchanged = diff.same_count || 0;
   console.log(`Project: ${resolvedSlug}  (${info.project_id})`);
-  console.log(`  changed:     ${sum.changed}`);
-  console.log(`  only_local:  ${sum.only_local}`);
-  console.log(`  only_remote: ${sum.only_remote}`);
-  console.log(`  unchanged:   ${sum.same}`);
-  if (sum.changed > 0) {
-    console.log('\nChanged files:');
-    for (const f of diff.changed.slice(0, 20)) console.log(`  M  ${f.path}`);
-    if (diff.changed.length > 20) console.log(`  ... and ${diff.changed.length - 20} more`);
-  }
-  if (sum.only_local > 0) {
-    console.log('\nLocal-only (will be added on push):');
-    for (const f of diff.only_local.slice(0, 20)) console.log(`  +  ${f.path}`);
-    if (diff.only_local.length > 20) console.log(`  ... and ${diff.only_local.length - 20} more`);
-  }
-  if (sum.only_remote > 0) {
-    console.log('\nRemote-only (deleted locally or never pulled — pass --include-deletes to push to commit deletions):');
-    for (const f of diff.only_remote.slice(0, 20)) console.log(`  -  ${f.path}`);
-    if (diff.only_remote.length > 20) console.log(`  ... and ${diff.only_remote.length - 20} more`);
-  }
-  return diff;
+  console.log('Compared against the DEPLOY SOURCE (builder_code_versions + asset store).\n');
+  console.log('Code:');
+  console.log(`  changed:     ${changed}`);
+  console.log(`  added:       ${onlyLocal}`);
+  console.log(`  remote-only: ${onlyRemote}`);
+  console.log(`  unchanged:   ${unchanged}`);
+  console.log('Assets (images/fonts/video under public/<subdir>/):');
+  console.log(`  to upload:   ${assetToUpload.length}  (new or changed)`);
+  console.log(`  unchanged:   ${assetSkipped}`);
+  console.log(`  total local: ${assetAll.length}`);
+
+  const printList = (items, marker, header, getPath = (f) => f.path) => {
+    if (!items || items.length === 0) return;
+    console.log(`\n${header}`);
+    for (const f of items.slice(0, 20)) console.log(`  ${marker}  ${getPath(f)}`);
+    if (items.length > 20) console.log(`  ... and ${items.length - 20} more`);
+  };
+  printList(diff.changed, 'M', 'Changed code:');
+  printList(diff.only_local, '+', 'Added code (will be created on push):');
+  printList(
+    diff.only_remote,
+    '-',
+    'Remote-only code (deleted locally or never pulled — push --include-deletes to delete):',
+  );
+  printList(assetToUpload, 'A', 'Assets to upload (new or changed):');
+  return { diff, plan };
 }
 
 export async function runProjectPush({