@gitgov/core 2.7.0 → 2.7.2

package/dist/src/{agent_runner-CHDkBfPZ.d.ts → agent_runner-DijNVjaF.d.ts}

@@ -1,7 +1,7 @@
 import { S as SessionStore } from './session_store-I4Z6PW2c.js';
 import { k as ISessionManager, a as GitGovSession, A as ActorState, S as SyncPreferencesUpdate, K as KeyProvider, h as FileLister, F as FsFileListerOptions, i as FileListOptions, j as FileStats, G as GitGovConfig } from './index-LULVRsCZ.js';
-import { q as IIdentityAdapter, u as IdentityAdapterDependencies, S as SyncStateModuleDependencies, p as IEventStream } from './sync_state-Bn_LogJ2.js';
-import { A as ActorPayload, d as ActorRecord, G as GitGovRecord, m as ExecutionRecord, z as RecordStores, f as AgentRecord } from './record_projection.types-Dz9YU3r9.js';
+import { q as IIdentityAdapter, u as IdentityAdapterDependencies, S as SyncStateModuleDependencies, p as IEventStream } from './sync_state-C2a2RuBQ.js';
+import { A as ActorPayload, d as ActorRecord, G as GitGovRecord, l as ExecutionRecord, y as RecordStores, f as AgentRecord } from './record_projection.types-D9NkQbL_.js';
 
 /**
  * SessionManager - Local Session State Manager

package/dist/src/fs.d.ts

@@ -1,11 +1,11 @@
-import { R as RecordStore, I as IdEncoder, a as IRecordProjector, G as GitGovRecord, b as IRecordProjection, c as IndexData, P as ProjectionContext } from './record_projection.types-Dz9YU3r9.js';
-export { D as DEFAULT_ID_ENCODER } from './record_projection.types-Dz9YU3r9.js';
+import { R as RecordStore, I as IdEncoder, a as IRecordProjector, G as GitGovRecord, b as IRecordProjection, c as IndexData, P as ProjectionContext } from './record_projection.types-D9NkQbL_.js';
+export { D as DEFAULT_ID_ENCODER } from './record_projection.types-D9NkQbL_.js';
 import { C as ConfigStore, G as GitGovConfig, a as GitGovSession, I as IGitModule, b as GitModuleDependencies, E as ExecOptions, c as ExecResult, d as ChangedFile, e as GetCommitHistoryOptions, f as CommitInfo, g as CommitAuthor } from './index-LULVRsCZ.js';
 export { F as FsFileListerOptions } from './index-LULVRsCZ.js';
-import { C as ConfigManager, I as ILintModule, L as LintOptions, a as LintReport, F as FixRecordOptions, b as FixReport, R as RecordStores, c as LintRecordContext, d as LintResult, e as ISyncStateModule, S as SyncStateModuleDependencies, f as StateDeltaFile, g as ConflictDiff, h as IntegrityViolation, A as AuditStateOptions, i as AuditStateReport, j as SyncStatePushOptions, k as SyncStatePushResult, l as SyncStatePullOptions, m as SyncStatePullResult, n as SyncStateResolveOptions, o as SyncStateResolveResult, p as IEventStream } from './sync_state-Bn_LogJ2.js';
+import { C as ConfigManager, I as ILintModule, L as LintOptions, a as LintReport, F as FixRecordOptions, b as FixReport, R as RecordStores, c as LintRecordContext, d as LintResult, e as ISyncStateModule, S as SyncStateModuleDependencies, f as StateDeltaFile, g as ConflictDiff, h as IntegrityViolation, A as AuditStateOptions, i as AuditStateReport, j as SyncStatePushOptions, k as SyncStatePushResult, l as SyncStatePullOptions, m as SyncStatePullResult, n as SyncStateResolveOptions, o as SyncStateResolveResult, p as IEventStream } from './sync_state-C2a2RuBQ.js';
 import { S as SessionStore } from './session_store-I4Z6PW2c.js';
-import { S as SessionManager, I as IProjectInitializer, E as EnvironmentValidation, F as FsWorktreeSyncStateDependencies, a as FsWorktreeSyncStateConfig, b as IAgentRunner, P as ProtocolHandlerRegistry, A as AgentRunnerDependencies, R as RunOptions, c as AgentResponse } from './agent_runner-CHDkBfPZ.js';
-export { f as FsFileLister, d as FsKeyProvider, e as FsKeyProviderOptions } from './agent_runner-CHDkBfPZ.js';
+import { S as SessionManager, I as IProjectInitializer, E as EnvironmentValidation, F as FsWorktreeSyncStateDependencies, a as FsWorktreeSyncStateConfig, b as IAgentRunner, P as ProtocolHandlerRegistry, A as AgentRunnerDependencies, R as RunOptions, c as AgentResponse } from './agent_runner-DijNVjaF.js';
+export { f as FsFileLister, d as FsKeyProvider, e as FsKeyProviderOptions } from './agent_runner-DijNVjaF.js';
 
 /**
  * Serializer for FsRecordStore - allows custom serialization
@@ -313,6 +313,10 @@ declare class FsLintModule implements IFsLintModule {
      * Delegates to LintModule.lintRecord() for pure validation.
      */
     lintRecord(record: GitGovRecord, context: LintRecordContext): LintResult[];
+    /**
+     * Delegates to LintModule.lintRecordReferences() for prefix validation.
+     */
+    lintRecordReferences(record: GitGovRecord, context: LintRecordContext): LintResult[];
     /**
      * Delegates to LintModule.fixRecord() for pure fix.
      */
@@ -1244,13 +1248,19 @@ declare class FsWorktreeSyncStateModule implements ISyncStateModule {
     getWorktreePath(): string;
     /** [WTSYNC-A1..A6] Ensures worktree exists and is healthy */
     ensureWorktree(): Promise<void>;
+    /**
+     * [WTSYNC-A7] Remove .gitignore from state branch if it exists.
+     * The worktree module filters files in code (shouldSyncFile()), not via .gitignore.
+     * Legacy state branches initialized by FsSyncState may have a .gitignore — remove it.
+     */
+    private removeLegacyGitignore;
     /** Check worktree health */
     private checkWorktreeHealth;
     /** Remove worktree cleanly */
     private removeWorktree;
-    /** [WTSYNC-B1..B14] Push local state to remote */
+    /** [WTSYNC-B1..B16] Push local state to remote */
     pushState(options: SyncStatePushOptions): Promise<SyncStatePushResult>;
-    /** [WTSYNC-C1..C8] Pull remote state */
+    /** [WTSYNC-C1..C9] Pull remote state */
     pullState(options?: SyncStatePullOptions): Promise<SyncStatePullResult>;
     /** [WTSYNC-D1..D7] Resolve rebase conflict */
     resolveConflict(options: SyncStateResolveOptions): Promise<SyncStateResolveResult>;
@@ -1276,6 +1286,12 @@ declare class FsWorktreeSyncStateModule implements ISyncStateModule {
     private execGit;
     /** Execute git command in worktree context (throws on non-zero exit) */
     private execInWorktree;
+    /**
+     * [WTSYNC-B16] Check if local gitgov-state has commits not present on remote.
+     * Returns { ahead: true } if local has unpushed commits or remote branch doesn't exist.
+     * Also returns { remoteExists } to let caller decide whether reconciliation is needed.
+     */
+    private isLocalAheadOfRemote;
     /** Calculate file delta (uncommitted changes in worktree) */
     private calculateFileDelta;
     /** [WTSYNC-B4/B9/B10/B11] Stage only syncable files from delta (adds, mods, and deletions) */

package/dist/src/fs.js

@@ -1798,20 +1798,10 @@ var embedded_metadata_schema_default = {
             "execution",
             "changelog",
             "feedback",
-            "cycle",
-            "custom"
+            "cycle"
           ],
           description: "The type of the record contained in the payload."
         },
-        schemaUrl: {
-          type: "string",
-          description: "Optional URL to a custom schema for the payload."
-        },
-        schemaChecksum: {
-          type: "string",
-          pattern: "^[a-fA-F0-9]{64}$",
-          description: "Optional SHA-256 checksum of the custom schema."
-        },
         payloadChecksum: {
           type: "string",
           pattern: "^[a-fA-F0-9]{64}$",
@@ -2035,32 +2025,6 @@ var embedded_metadata_schema_default = {
         }
       },
       else: false
-    },
-    {
-      if: {
-        properties: {
-          header: {
-            type: "object",
-            properties: {
-              type: {
-                const: "custom"
-              }
-            }
-          }
-        }
-      },
-      then: {
-        properties: {
-          header: {
-            type: "object",
-            required: [
-              "schemaUrl",
-              "schemaChecksum"
-            ]
-          }
-        }
-      },
-      else: false
     }
   ],
   examples: [
@@ -3551,6 +3515,12 @@ var FsLintModule = class {
   lintRecord(record, context) {
     return this.lintModule.lintRecord(record, context);
   }
+  /**
+   * Delegates to LintModule.lintRecordReferences() for prefix validation.
+   */
+  lintRecordReferences(record, context) {
+    return this.lintModule.lintRecordReferences(record, context);
+  }
   /**
    * Delegates to LintModule.fixRecord() for pure fix.
    */
@@ -3803,6 +3773,14 @@ var FsLintModule = class {
         const namingResults = this.validateFileNaming(record, recordId, filePath, entityType);
         results.push(...namingResults);
       }
+      if (options.validateReferences) {
+        const refResults = this.lintModule.lintRecordReferences(record, {
+          recordId,
+          entityType,
+          filePath
+        });
+        results.push(...refResults);
+      }
     } catch (error) {
       if (error instanceof DetailedValidationError) {
         const hasAdditionalProperties = error.errors.some(
@@ -7668,7 +7646,7 @@ var FsWorktreeSyncStateModule = class {
     this.gitgovPath = path9__default.join(this.worktreePath, ".gitgov");
   }
   // ═══════════════════════════════════════════════
-  // Section A: Worktree Management (WTSYNC-A1..A6)
+  // Section A: Worktree Management (WTSYNC-A1..A7)
   // ═══════════════════════════════════════════════
   /** [WTSYNC-A4] Returns the worktree path */
   getWorktreePath() {
@@ -7679,6 +7657,7 @@ var FsWorktreeSyncStateModule = class {
     const health = await this.checkWorktreeHealth();
     if (health.healthy) {
       logger7.debug("Worktree is healthy");
+      await this.removeLegacyGitignore();
       return;
     }
     if (health.exists && !health.healthy) {
@@ -7696,6 +7675,26 @@ var FsWorktreeSyncStateModule = class {
         error instanceof Error ? error : void 0
       );
     }
+    await this.removeLegacyGitignore();
+  }
+  /**
+   * [WTSYNC-A7] Remove .gitignore from state branch if it exists.
+   * The worktree module filters files in code (shouldSyncFile()), not via .gitignore.
+   * Legacy state branches initialized by FsSyncState may have a .gitignore — remove it.
+   */
+  async removeLegacyGitignore() {
+    const gitignorePath = path9__default.join(this.worktreePath, ".gitignore");
+    if (!existsSync(gitignorePath)) return;
+    logger7.info("Removing legacy .gitignore from state branch");
+    try {
+      await this.execInWorktree(["rm", ".gitignore"]);
+      await this.execInWorktree(["commit", "-m", "gitgov: remove legacy .gitignore (filtering is in code)"]);
+    } catch {
+      try {
+        await promises.unlink(gitignorePath);
+      } catch {
+      }
+    }
   }
   /** Check worktree health */
   async checkWorktreeHealth() {
@@ -7741,9 +7740,9 @@ var FsWorktreeSyncStateModule = class {
     }
   }
   // ═══════════════════════════════════════════════
-  // Section B: Push Operations (WTSYNC-B1..B14)
+  // Section B: Push Operations (WTSYNC-B1..B16)
   // ═══════════════════════════════════════════════
-  /** [WTSYNC-B1..B14] Push local state to remote */
+  /** [WTSYNC-B1..B16] Push local state to remote */
   async pushState(options) {
     const { actorId, dryRun = false, force = false } = options;
     const log = (msg) => logger7.debug(`[pushState] ${msg}`);
@@ -7771,11 +7770,53 @@ var FsWorktreeSyncStateModule = class {
     const delta = rawDelta.filter((f) => shouldSyncFile2(f.file));
     log(`Delta: ${delta.length} syncable files (${rawDelta.length} total)`);
     if (delta.length === 0) {
+      const { ahead: aheadOfRemote, remoteExists } = await this.isLocalAheadOfRemote();
+      if (!aheadOfRemote) {
+        return {
+          success: true,
+          filesSynced: 0,
+          sourceBranch: options.sourceBranch ?? "current",
+          commitHash: null,
+          commitMessage: null,
+          conflictDetected: false
+        };
+      }
+      log("No uncommitted changes but local is ahead of remote \u2014 pushing existing commits");
+      if (remoteExists && !force) {
+        try {
+          await this.execInWorktree(["pull", "--rebase", "origin", this.stateBranchName]);
+        } catch (err) {
+          if (await this.isRebaseInProgress()) {
+            const affectedFiles = await this.getConflictedFiles();
+            return {
+              success: false,
+              filesSynced: 0,
+              sourceBranch: options.sourceBranch ?? "current",
+              commitHash: null,
+              commitMessage: null,
+              conflictDetected: true,
+              conflictInfo: {
+                type: "rebase_conflict",
+                affectedFiles,
+                message: "Rebase conflict during push reconciliation (local ahead, no uncommitted changes)",
+                resolutionSteps: [
+                  `Edit conflicted files in ${this.worktreePath}/.gitgov/`,
+                  'Run `gitgov sync resolve --reason "..."` to finalize'
+                ]
+              },
+              error: "Rebase conflict during push reconciliation"
+            };
+          }
+          throw err;
+        }
+      }
+      await this.execInWorktree(["push", "origin", this.stateBranchName]);
+      const currentHead = (await this.execInWorktree(["rev-parse", "HEAD"])).trim();
       return {
         success: true,
         filesSynced: 0,
         sourceBranch: options.sourceBranch ?? "current",
-        commitHash: null,
+        commitHash: currentHead,
         commitMessage: null,
         conflictDetected: false
       };
@@ -7870,9 +7911,9 @@ var FsWorktreeSyncStateModule = class {
     return result;
   }
   // ═══════════════════════════════════════════════
-  // Section C: Pull Operations (WTSYNC-C1..C8)
+  // Section C: Pull Operations (WTSYNC-C1..C9)
   // ═══════════════════════════════════════════════
-  /** [WTSYNC-C1..C8] Pull remote state */
+  /** [WTSYNC-C1..C9] Pull remote state */
   async pullState(options) {
     const { forceReindex = false, force = false } = options ?? {};
     const log = (msg) => logger7.debug(`[pullState] ${msg}`);
@@ -8298,6 +8339,33 @@ var FsWorktreeSyncStateModule = class {
   async execInWorktree(args, options) {
     return this.execGit(["-C", this.worktreePath, ...args], options);
   }
+  /**
+   * [WTSYNC-B16] Check if local gitgov-state has commits not present on remote.
+   * Returns { ahead: true } if local has unpushed commits or remote branch doesn't exist.
+   * Also returns { remoteExists } to let caller decide whether reconciliation is needed.
+   */
+  async isLocalAheadOfRemote() {
+    try {
+      await this.execGit(["ls-remote", "--exit-code", "origin", this.stateBranchName]);
+    } catch {
+      return { ahead: true, remoteExists: false };
+    }
+    try {
+      await this.execInWorktree(["fetch", "origin", this.stateBranchName]);
+    } catch {
+      return { ahead: false, remoteExists: true };
+    }
+    try {
+      const count = (await this.execInWorktree([
+        "rev-list",
+        `origin/${this.stateBranchName}..HEAD`,
+        "--count"
+      ])).trim();
+      return { ahead: parseInt(count, 10) > 0, remoteExists: true };
+    } catch {
+      return { ahead: true, remoteExists: true };
+    }
+  }
   /** Calculate file delta (uncommitted changes in worktree) */
   async calculateFileDelta() {
     try {