soulguard 0.2.3 → 0.3.0

package/dist/index.js

@@ -4949,7 +4949,7 @@ class StateTree {
     return this.flatFiles().filter((f) => f.status !== "unchanged");
   }
   stagedFiles() {
-    return this.flatFiles().filter((f) => f.stagedHash !== null || f.status === "deleted");
+    return this.flatFiles().filter((f) => f.status !== "unchanged");
   }
   driftedEntities() {
     return collectDrifts(this.entities, this.protectOwnership);
@@ -7056,6 +7056,10 @@ class TierCommand {
       this.out.error(`Failed to write config: ${writeResult.error.message}`);
       return 1;
     }
+    const sgCopyResult = await createStagingCopy(ops, "soulguard.json", configResult.value.defaultOwnership ?? undefined);
+    if (!sgCopyResult.ok) {
+      this.out.warn(`  Warning: staging copy failed for soulguard.json: ${sgCopyResult.error}`);
+    }
     if (action.kind === "set" && action.tier === "protect") {
       const expectedProtectOwnership = getProtectOwnership(configResult.value.guardian);
       for (const file of changedPaths) {
@@ -7395,17 +7399,11 @@ class ProposalManager extends EventEmitter {
         if (!freshTree.ok) {
           const error = new Error(`Failed to build fresh state tree: ${freshTree.error.message}`);
           this.emit("error", error, "approval:verification");
-          proposal.state = "rejected";
-          this._activeProposal = null;
-          await this._channel.postResult(proposal.externalId, "rejected");
-          this.emit("rejected", proposal);
+          await this._rejectProposal(proposal);
           return;
         }
         if (freshTree.value.approvalHash !== proposal.payload.hash) {
-          proposal.state = "rejected";
-          this._activeProposal = null;
-          await this._channel.postResult(proposal.externalId, "rejected");
-          this.emit("rejected", proposal);
+          await this._rejectProposal(proposal);
           return;
         }
         const applyResult = await apply({
@@ -7416,10 +7414,7 @@ class ProposalManager extends EventEmitter {
         if (!applyResult.ok) {
           const error = new Error(`Apply failed: ${applyResult.error.kind}`);
           this.emit("error", error, "approval:apply");
-          proposal.state = "rejected";
-          this._activeProposal = null;
-          await this._channel.postResult(proposal.externalId, "rejected");
-          this.emit("rejected", proposal);
+          await this._rejectProposal(proposal);
           return;
         }
         proposal.state = "approved";
@@ -7427,10 +7422,7 @@ class ProposalManager extends EventEmitter {
         await this._channel.postResult(proposal.externalId, "applied");
         this.emit("applied", proposal);
       } else {
-        proposal.state = "rejected";
-        this._activeProposal = null;
-        await this._channel.postResult(proposal.externalId, "rejected");
-        this.emit("rejected", proposal);
+        await this._rejectProposal(proposal);
       }
     } catch (e) {
       if (e instanceof DOMException && e.name === "AbortError")
@@ -7439,15 +7431,21 @@ class ProposalManager extends EventEmitter {
         return;
       const error = e instanceof Error ? e : new Error(String(e));
       this.emit("error", error, "approval:wait");
-      proposal.state = "rejected";
-      this._activeProposal = null;
+      await this._rejectProposal(proposal);
     }
   }
+  async _rejectProposal(proposal) {
+    proposal.state = "rejected";
+    await this._resetStaging(proposal);
+    this._pendingProposalHash = null;
+    this._activeProposal = null;
+    await this._channel.postResult(proposal.externalId, "rejected");
+    this.emit("rejected", proposal);
+  }
   async _supersedePending() {
     if (this._activeProposal && this._abortController) {
       const oldProposal = this._activeProposal;
       const oldController = this._abortController;
-      oldProposal.state = "superseded";
       this._activeProposal = null;
       this._abortController = null;
       oldController.abort();
@@ -7455,6 +7453,9 @@ class ProposalManager extends EventEmitter {
         await this._pendingFlow.catch(() => {});
         this._pendingFlow = null;
       }
+      if (oldProposal.state !== "pending")
+        return;
+      oldProposal.state = "superseded";
       await this._channel.postResult(oldProposal.externalId, "superseded");
       this.emit("superseded", oldProposal);
     }
@@ -7469,6 +7470,15 @@ class ProposalManager extends EventEmitter {
     this._activeProposal = null;
     this._abortController = null;
   }
+  async _resetStaging(proposal) {
+    const defaultOwnership = this._config.defaultOwnership;
+    for (const file of proposal.payload.files) {
+      const result = file.status === "created" ? await this._ops.deleteFile(stagingPath(file.path)) : await createStagingCopy(this._ops, file.path, defaultOwnership);
+      if (!result.ok) {
+        this.emit("error", new Error(`Reset staging failed for ${file.path}: ${String(result.error)}`), `resetStaging:${file.path}`);
+      }
+    }
+  }
 }
 // ../core/src/daemon/daemon.ts
 import { EventEmitter as EventEmitter2 } from "node:events";
@@ -7493,15 +7503,20 @@ function getChannel(name) {
 class SoulguardDaemon extends EventEmitter2 {
   _ops;
   _config;
+  _channelOverride;
+  _maxProposals;
   _channel = null;
   _proposalManager = null;
   _syncTimer = null;
   _syncRunning = false;
   _running = false;
+  _doneResolve = null;
   constructor(options) {
     super();
     this._ops = options.ops;
     this._config = options.config;
+    this._channelOverride = options.channelOverride ?? null;
+    this._maxProposals = options.maxProposals ?? null;
   }
   get running() {
     return this._running;
@@ -7516,14 +7531,20 @@ class SoulguardDaemon extends EventEmitter2 {
     if (!daemonConfig) {
       throw new Error("Daemon configuration missing. Add a 'daemon' section to soulguard.json.");
     }
-    const channelName = daemonConfig.channel;
-    if (channelName) {
-      const createChannelFn = getChannel(channelName);
-      if (!createChannelFn) {
-        throw new Error(`No channel registered for "${channelName}". Register it with registerChannel() before starting the daemon.`);
+    if (this._channelOverride) {
+      this._channel = this._channelOverride;
+    } else {
+      const channelName = daemonConfig.channel;
+      if (channelName) {
+        const createChannelFn = getChannel(channelName);
+        if (!createChannelFn) {
+          throw new Error(`No channel registered for "${channelName}". Register it with registerChannel() before starting the daemon.`);
+        }
+        const channelConfig = daemonConfig[channelName];
+        this._channel = createChannelFn(channelConfig);
       }
-      const channelConfig = daemonConfig[channelName];
-      this._channel = createChannelFn(channelConfig);
+    }
+    if (this._channel) {
       this._proposalManager = new ProposalManager({
         ops: this._ops,
         config: this._config,
@@ -7534,6 +7555,17 @@ class SoulguardDaemon extends EventEmitter2 {
       this._proposalManager.on("rejected", (...args) => this.emit("rejected", ...args));
       this._proposalManager.on("superseded", (...args) => this.emit("superseded", ...args));
       this._proposalManager.on("error", (...args) => this.emit("proposal:error", ...args));
+      if (this._maxProposals != null) {
+        let count = 0;
+        const checkDone = () => {
+          count++;
+          if (count >= this._maxProposals) {
+            this.stop();
+          }
+        };
+        this._proposalManager.on("applied", checkDone);
+        this._proposalManager.on("rejected", checkDone);
+      }
       this._proposalManager.start();
     }
     const syncIntervalSecs = daemonConfig.syncIntervalSecs ?? 60;
@@ -7543,6 +7575,13 @@ class SoulguardDaemon extends EventEmitter2 {
     }
     this._running = true;
   }
+  done() {
+    if (!this._running)
+      return Promise.resolve();
+    return new Promise((resolve3) => {
+      this._doneResolve = resolve3;
+    });
+  }
   async stop() {
     if (!this._running)
       return;
@@ -7555,10 +7594,12 @@ class SoulguardDaemon extends EventEmitter2 {
       await this._proposalManager.stop();
       this._proposalManager = null;
     }
-    if (this._channel) {
+    if (this._channel && !this._channelOverride) {
       await this._channel.dispose();
       this._channel = null;
     }
+    this._doneResolve?.();
+    this._doneResolve = null;
   }
   async _runSync() {
     if (this._syncRunning)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soulguard",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "Identity protection for AI agents",
   "homepage": "https://soulguard.ai",
   "license": "MIT",