@animalabs/agent-framework 0.6.5 → 0.6.7

package/src/api/server.ts

@@ -468,6 +468,10 @@ export class ApiServer {
     store.switchBranch(params.name);
     this.currentBranch = params.name;
 
+    // Reversible Discord awareness markers are part of the branch projection.
+    // Do not acknowledge the switch until add/remove operations were attempted.
+    await this.framework.syncDiscordAwarenessMarkers();
+
     // Materialize config files from the new branch
     const ws = this.framework.getModule('workspace');
     if (ws && 'materializeMount' in ws) {
@@ -511,7 +515,7 @@ export class ApiServer {
   // Undo/Redo Commands
   // ==========================================================================
 
-  private cmdUndo(params: { agentName: string }): unknown {
+  private async cmdUndo(params: { agentName: string }): Promise<unknown> {
     if (!params.agentName) {
       throw new Error('agentName is required');
     }
@@ -520,6 +524,7 @@ export class ApiServer {
 
     if (result.undone) {
       this.currentBranch = result.toBranch!;
+      await this.framework.syncDiscordAwarenessMarkers();
       this.broadcast('branch:switched', {
         from: result.fromBranch,
         to: result.toBranch,
@@ -530,7 +535,7 @@ export class ApiServer {
     return result;
   }
 
-  private cmdRedo(params: { agentName: string }): unknown {
+  private async cmdRedo(params: { agentName: string }): Promise<unknown> {
     if (!params.agentName) {
       throw new Error('agentName is required');
     }
@@ -539,6 +544,7 @@ export class ApiServer {
 
     if (result.redone) {
       this.currentBranch = result.toBranch!;
+      await this.framework.syncDiscordAwarenessMarkers();
       this.broadcast('branch:switched', {
         from: result.fromBranch,
         to: result.toBranch,

package/src/canonical-json.ts

@@ -0,0 +1,22 @@
+function normalizeCanonicalJson(value: unknown): unknown {
+  if (Array.isArray(value)) {
+    return value.map((entry) => normalizeCanonicalJson(entry));
+  }
+  if (value && typeof value === 'object') {
+    const withToJson = value as { toJSON?: () => unknown };
+    if (typeof withToJson.toJSON === 'function') {
+      return normalizeCanonicalJson(withToJson.toJSON());
+    }
+    const normalized: Record<string, unknown> = {};
+    for (const key of Object.keys(value as Record<string, unknown>).sort()) {
+      const child = normalizeCanonicalJson((value as Record<string, unknown>)[key]);
+      if (child !== undefined) normalized[key] = child;
+    }
+    return normalized;
+  }
+  return value;
+}
+
+export function canonicalJsonStringify(value: unknown): string {
+  return JSON.stringify(normalizeCanonicalJson(value)) ?? 'null';
+}