shraga 0.1.45 → 0.1.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shraga",
-  "version": "0.1.45",
+  "version": "0.1.47",
   "description": "The teammate you delegate coding to — a self-hostable, multi-user AI coding agent web UI (Claude Code, with a pluggable engine seam).",
   "type": "module",
   "main": "./src/index.ts",

package/src/server/data-sync.ts

@@ -1,5 +1,6 @@
 import { existsSync, readFileSync, writeFileSync, mkdirSync, statSync } from 'node:fs';
 import path from 'node:path';
+import { hostname } from 'node:os';
 import { DATA_DIR } from './paths.ts';
 import { emitEvent } from './events/bus.ts';
 import { runTextQuery } from './sdk-utils.ts';
@@ -18,6 +19,15 @@ export class DataSyncOptions {
    * A real deployment must ALSO set DATA_SYNC_ENABLE=1. Dev/verify boots never sync/push.
    */
   enabled = process.env.DATA_SYNC_ENABLE === '1' || process.env.DATA_SYNC_ENABLE === 'true';
+  /**
+   * Owner-facing alerts are a PROD side effect, so only the designated single-writer instance
+   * (the same one that fires schedules) may DM owners. A dev laptop legitimately syncs the shared
+   * data repo, but it also shares .env's APP_NAME, OWNERS and the Slack bot token — so its alerts
+   * are indistinguishable from the box's. Past incident 2026-08-20: a laptop pinned to an older
+   * shraga re-sent a merge-conflict alert for a bug already fixed AND deployed on the box, and the
+   * DM gave no way to tell which instance sent it. Suppressed alerts are still logged locally.
+   */
+  notify = process.env.DATA_SYNC_SCHEDULER_ACTIVE === 'true';
 }
 
 export class DataSync {
@@ -97,8 +107,8 @@ export class DataSync {
       }
       this.ensureGitignore();
       if (!this.verifyDeploymentId()) return;
+      await this.configureGit(); // must precede untrackIgnored — it neutralises per-user excludes
       await this.untrackIgnored();
-      await this.configureGit();
       this.ready = true;
     }
 
@@ -550,6 +560,12 @@ export class DataSync {
   }
 
   private async notifyOwners(text: string): Promise<void> {
+    if (!this.options.notify) {
+      // Not the authoritative instance — log it so a dev run still surfaces the problem locally,
+      // but never DM owners (see DataSyncOptions.notify).
+      console.warn(`${TAG} notification suppressed (not the authoritative instance):\n${text}`);
+      return;
+    }
     // No Slack coupling here — resolve owner contacts and publish a deploy notice on the event bus.
     // The Slack feature (slackFeature) subscribes and DMs each owner. Owner resolution uses the
     // contacts store only, so data-sync stays transport-agnostic.
@@ -562,7 +578,10 @@ export class DataSync {
       console.warn(`${TAG} No owners (OWNERS env) with Slack IDs found, skipping notification`);
       return;
     }
-    emitEvent('data-sync', { kind: 'deploy', owners, text });
+    // Stamp the sender: every owner alert must name the instance it came from, so "is this back?"
+    // is answerable without log archaeology across hosts.
+    const from = `${this.options.deploymentId || 'shraga'}@${hostname()}`;
+    emitEvent('data-sync', { kind: 'deploy', owners, text: `${text}\n\n_from ${from}_` });
   }
 
   /**
@@ -605,7 +624,13 @@ export class DataSync {
   /** Commit a refreshed .gitignore and untrack any committed files that now match it. */
   private async untrackIgnored(): Promise<void> {
     await this.git('add', '.gitignore').catch(() => {});
-    const out = await this.git('ls-files', '-i', '-c', '--exclude-standard').catch(() => '');
+    // core.excludesFile=/dev/null: --exclude-standard would otherwise fold in the USER'S global
+    // gitignore (~/.gitignore_global) and untrack files that are ignored on this host only. The
+    // data repo is shared, so a personal rule must never decide what leaves the remote. Real
+    // near-miss 2026-08-20: a laptop's global `.agent/` rule staged 50 files for deletion —
+    // including workspace/.agent/memory/MEMORY.md, the agent's own memory — and only
+    // guardMassDeletions() stopped it. Only the repo's OWN .gitignore may untrack anything.
+    const out = await this.git('-c', 'core.excludesFile=/dev/null', 'ls-files', '-i', '-c', '--exclude-standard').catch(() => '');
     // Only untrack files that actually exist on disk AND match .gitignore.
     // git ls-files -i can falsely report tracked files missing from the worktree
     // (remote-only files restored during init). Removing those wipes remote data.
@@ -654,6 +679,8 @@ export class DataSync {
     const name = process.env.APP_NAME || 'shraga';
     await this.git('config', 'user.name', `${name} agent`).catch(() => {});
     await this.git('config', 'user.email', `agent@${name}.local`).catch(() => {});
+    // The data repo must behave identically on every host: no per-user global gitignore.
+    await this.git('config', 'core.excludesFile', '/dev/null').catch(() => {});
   }
 
   private authedUrl(): string {