@whittlelabs/sifter 0.3.0 → 0.3.2

package/bin.js

@@ -15370,15 +15370,17 @@ var require_client = __commonJS({
           throw new Error(`Attention pool not found by name: "${ref.name}"`);
         return pool.id;
       }
-      // ── Subscribers ──────────────────────────────────────────────────
-      async listSubscribers(poolId) {
-        return this.request("GET", `/api/attention-pools/${poolId}/subscribers`);
+      // ── Members ──────────────────────────────────────────────────────
+      // A subscriber joins a pool by registering as a member of it. These
+      // map to the server's `/api/attention-pools/:poolId/members` routes.
+      async listMembers(poolId) {
+        return this.request("GET", `/api/attention-pools/${poolId}/members`);
       }
-      async registerSubscriber(poolId, options) {
-        return this.request("POST", `/api/attention-pools/${poolId}/subscribers`, options);
+      async registerMember(poolId, options) {
+        return this.request("POST", `/api/attention-pools/${poolId}/members`, options);
       }
-      async updateSubscriber(poolId, subscriberId, options) {
-        return this.request("PUT", `/api/attention-pools/${poolId}/subscribers/${subscriberId}`, options);
+      async updateMember(poolId, memberId, options) {
+        return this.request("PUT", `/api/attention-pools/${poolId}/members/${memberId}`, options);
       }
       // ── Jobs (producer) ──────────────────────────────────────────────
       /**
@@ -15801,13 +15803,17 @@ var require_subscribe = __commonJS({
         for (const ref of opts.pools) {
           const id = await opts.jobsClient.resolvePoolRef(ref);
           resolvedPoolIds.push(id);
-          await opts.jobsClient.registerSubscriber(id, {
+          await opts.jobsClient.registerMember(id, {
             identityType: opts.subscriber.identityType,
             identityId: opts.subscriber.identityId,
             intelligence: opts.subscriber.intelligence,
-            capabilities: opts.subscriber.capabilities,
             ...opts.subscriber.displayName !== void 0 ? { displayName: opts.subscriber.displayName } : {},
-            ...opts.subscriber.metadata !== void 0 ? { metadata: opts.subscriber.metadata } : {}
+            // The server has no first-class capabilities column; carry the
+            // advertised set in metadata so it persists on the member row.
+            metadata: {
+              ...opts.subscriber.metadata,
+              capabilities: opts.subscriber.capabilities
+            }
           });
         }
         logger.info("subscribe loop started", {
@@ -18448,7 +18454,7 @@ var import_shuttle = __toESM(require_dist4());
 // package.json
 var package_default = {
   name: "@whittlelabs/sifter",
-  version: "0.3.0",
+  version: "0.3.2",
   description: "Whittle Sifter: paired AI reviewer for Whittle Sift attention pools.",
   bin: {
     "whittle-sifter": "./dist/bin.js"
@@ -18525,12 +18531,19 @@ var sifterBrand = {
       id: "scaffold-run-config",
       phase: "post-pair",
       // The substrate's run command requires a YAML describing pools,
-      // executors, and Jobs auth. The web form that minted the pair
-      // command bakes the user's product-level choices (executor type,
-      // poll interval, caps) into the init flags. This step reads
-      // those choices from `ctx.setupOptions` and writes the matching
-      // YAML. For `claude-code` we prompt interactively for `cwd` if
-      // the user didn't pass `--cwd`; other executors don't need one.
+      // executors, and Jobs auth. The web form that minted the pair command
+      // bakes the user's product-level choices (executor type, poll interval)
+      // into the init flags; this step reads them from `ctx.setupOptions`.
+      //
+      // A re-pair must refresh the pairing-derived fields (Jobs URL, service
+      // identity, pools) even when sifter.yaml already exists — otherwise a
+      // stale file silently shadows the new pairing (exactly how a leftover
+      // `localhost:3005` and an old `cwd` once survived a fresh pair). So we
+      // merge rather than skip: rebuild the pairing fields from `pairing`, carry
+      // over the user's executor block (e.g. claude-code `cwd`) and polling
+      // unless a fresh flag overrides them, and log what happened. We only
+      // (re)scaffold an executor block — which may prompt for `cwd` — when there
+      // isn't one to preserve.
       run: async (ctx) => {
         const yamlPath = (0, import_path.join)(ctx.configDir, "sifter.yaml");
         const pairing = new import_shuttle.PairingConfigStore((0, import_path.join)(ctx.configDir, "config.json")).read();
@@ -18539,8 +18552,18 @@ var sifterBrand = {
             "Pairing returned no attention pools. The Sift backend should have provisioned one for this user during pre-pair."
           );
         }
-        const executor = ctx.setupOptions.executor ?? "claude-code";
-        const executorBlock = await buildExecutorBlock(executor, ctx);
+        let existing = {};
+        try {
+          existing = (0, import_yaml.parse)(await (0, import_promises.readFile)(yamlPath, "utf8")) ?? {};
+        } catch (err) {
+          if (err.code !== "ENOENT") throw err;
+        }
+        const isUpdate = Object.keys(existing).length > 0;
+        const existingExecutors = existing.executors ?? {};
+        const existingPools = Array.isArray(existing.pools) ? existing.pools : [];
+        const priorExecutor = typeof existingPools[0]?.executor === "string" ? existingPools[0].executor : void 0;
+        const executor = ctx.setupOptions.executor ?? priorExecutor ?? "claude-code";
+        const executorBlock = !ctx.setupOptions.executor && existingExecutors[executor] !== void 0 ? existingExecutors[executor] : await buildExecutorBlock(executor, ctx);
         const doc = {
           auth: {
             jobsApiUrl: pairing.jobsApiUrl
@@ -18555,18 +18578,18 @@ var sifterBrand = {
             executor
           })),
           executors: {
+            ...existingExecutors,
             [executor]: executorBlock
           }
         };
-        if (ctx.setupOptions.pollIntervalMs !== void 0) {
-          doc.polling = { intervalMs: ctx.setupOptions.pollIntervalMs };
+        const pollIntervalMs = ctx.setupOptions.pollIntervalMs ?? existing.polling?.intervalMs;
+        if (pollIntervalMs !== void 0) {
+          doc.polling = { intervalMs: pollIntervalMs };
         }
         await (0, import_promises.mkdir)(ctx.configDir, { recursive: true });
-        await (0, import_promises.writeFile)(yamlPath, (0, import_yaml.stringify)(doc), { flag: "wx" }).catch(
-          (err) => {
-            if (err.code === "EEXIST") return;
-            throw err;
-          }
+        await (0, import_promises.writeFile)(yamlPath, (0, import_yaml.stringify)(doc));
+        ctx.log(
+          isUpdate ? `Refreshed ${yamlPath} from this pairing (Jobs URL, identity, pools); kept your executor and polling settings.` : `Wrote ${yamlPath}.`
         );
       }
     }