@frontera-sdk/cli 1.52.39 → 1.52.41

package/src/local/local-sync-snapshot.ts

@@ -1,6 +1,7 @@
-import { appendFileSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { dirname, join } from 'node:path'
 
+import { ignoreInFronteraDir } from '../project-context'
 import { CliError } from '../errors'
 import { writeFileAtomic } from '../fs-atomic'
 import { hash, itemHash, safePath, SYNC_KINDS, type RemoteItem, type SyncKind, type SyncLock } from './local-sync-plan'
@@ -53,6 +54,8 @@ export interface SnapshotItem {
   state?: RemoteItem['state']
   /** Its binary files (a skill's assets), by project path, kept under `.frontera/sync/remote-assets/`. */
   assets?: string[]
+  /** Its files recovered from the deployed bundle, not its source (`RemoteItem.recovered`). */
+  recovered?: string[]
 }
 
 export interface RemoteSnapshot {
@@ -122,9 +125,14 @@ export interface RemoteSnapshot {
  * 10: a Plugin's description and icon. 11: Custom Apps, the brand and the
  * library. 12: an Agent's object tools carry their object definitions,
  * named by slug (`object/<slug>`). 13: a knowledge base's quality checks
- * (`quality-checks.yaml`).
+ * (`quality-checks.yaml`). 14: a Function's imports its source lacks,
+ * recovered from its deployed bundle. 15: an Agent's behavior settings read
+ * from its snapshot or record, as a released platform gives them. 16: an
+ * item's portability runs the checks `local dev` applies: a Function whose
+ * imports the pull can't bring, and an Action whose values the semantic types
+ * it writes refuse, are said not to run here.
  */
-export const SNAPSHOT_READER = 13
+export const SNAPSHOT_READER = 16
 
 /** The directory the snapshot recorded, as the reference rewriter reads it. */
 export function directoryOf(snap: RemoteSnapshot | null): Directory | undefined {
@@ -143,7 +151,7 @@ function namesOf(directory: Directory): RemoteSnapshot['names'] {
  * brought nothing keeps it, so it is not stale for nothing.
  */
 export function snapshotId(snap: RemoteSnapshot): string {
-  return hash(Object.keys(snap.items).sort().map((r) => `${r}\0${snap.items[r]!.revision ?? ''}\0${snap.items[r]!.hash}`).join('\n'))
+  return hash(Object.keys(snap.items).sort((a, b) => (String(a) < String(b) ? -1 : String(a) > String(b) ? 1 : 0)).map((r) => `${r}\0${snap.items[r]!.revision ?? ''}\0${snap.items[r]!.hash}`).join('\n'))
 }
 
 export function readSnapshot(root: string): RemoteSnapshot | null {
@@ -182,7 +190,7 @@ export function snapshotItems(root: string, snap: RemoteSnapshot): RemoteItem[]
       files[path] = content
     }
     const assets = (s.assets ?? []).map((path) => ({ path, from: underDir(root, ASSETS_DIR, path) }))
-    return [{ ref, kind: s.kind, name: s.name, title: s.title, files, version: s.version, id: s.id, revision: s.revision, unresolved: s.unresolved, notes: s.notes, requires: s.requires, ...(s.portability ? { portability: s.portability } : {}), ...(s.state ? { state: s.state } : {}), ...(assets.length ? { assets } : {}) }]
+    return [{ ref, kind: s.kind, name: s.name, title: s.title, files, version: s.version, id: s.id, revision: s.revision, unresolved: s.unresolved, notes: s.notes, requires: s.requires, ...(s.portability ? { portability: s.portability } : {}), ...(s.state ? { state: s.state } : {}), ...(assets.length ? { assets } : {}), ...(s.recovered?.length ? { recovered: s.recovered } : {}) }]
   })
 }
 
@@ -208,12 +216,8 @@ export function knownGone(snap: RemoteSnapshot | null): (ref: string) => boolean
 
 /** `.frontera/` keeps the runtime's state out of git; the snapshot and the base stay out too. */
 function ignoreSyncDir(root: string): void {
-  const ignore = join(root, '.frontera', '.gitignore')
-  mkdirSync(dirname(ignore), { recursive: true })
-  const text = existsSync(ignore) ? readFileSync(ignore, 'utf8') : ''
-  if (text.split(/\r?\n/).some((l) => l.trim() === 'sync/' || l.trim() === 'sync')) return
-  if (text) appendFileSync(ignore, `${text.endsWith('\n') ? '' : '\n'}sync/\n`)
-  else writeFileSync(ignore, 'local/\nsync/\n')
+  // A pulled or linked project: its sync state, and this machine's profile binding, stay out of git.
+  ignoreInFronteraDir(root, ['local/', 'sync/'])
 }
 
 function toSnapshotItem(item: RemoteItem, revision?: string): SnapshotItem {
@@ -224,14 +228,15 @@ function toSnapshotItem(item: RemoteItem, revision?: string): SnapshotItem {
     ...(item.id ? { id: item.id } : {}),
     ...(revision ?? item.revision ? { revision: revision ?? item.revision } : {}),
     hash: itemHash(item.files),
-    files: Object.keys(item.files).sort(),
+    files: Object.keys(item.files).sort((a, b) => (String(a) < String(b) ? -1 : String(a) > String(b) ? 1 : 0)),
     ...(item.version ? { version: item.version } : {}),
     unresolved: item.unresolved,
     notes: item.notes,
     requires: item.requires ?? [],
     ...(item.portability ? { portability: item.portability } : {}),
     ...(item.state ? { state: item.state } : {}),
-    ...(item.assets?.length ? { assets: item.assets.map((a) => a.path).sort() } : {}),
+    ...(item.assets?.length ? { assets: item.assets.map((a) => a.path).sort((a, b) => (String(a) < String(b) ? -1 : String(a) > String(b) ? 1 : 0)) } : {}),
+    ...(item.recovered?.length ? { recovered: [...item.recovered].sort((a, b) => (String(a) < String(b) ? -1 : String(a) > String(b) ? 1 : 0)) } : {}),
   }
 }