@jacebenson/jsn 4.3.8-dev.55 → 4.3.8-dev.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jacebenson/jsn",
-  "version": "4.3.8-dev.55",
+  "version": "4.3.8-dev.56",
   "description": "A command-line interface for ServiceNow that follows the Unix philosophy: simple, composable, and scriptable.",
   "type": "module",
   "bin": {

package/src/commands/updatesets.js

@@ -560,25 +560,16 @@ export function updateSetsCmd(wrap) {
               throw errUsage(`Cannot set "${name}" as current — update set is ${stateRaw === 'ignore' ? 'ignored' : 'complete'}.\nView it instead: jsn updatesets show "${name}"`);
             }
             const userSysID = await requireCurrentUserSysId(app.sdk);
-            await setCurrentUpdateSet(app.sdk, userSysID, sysID);
-
-            // Like the platform update set picker: switching the set also
-            // switches the application scope into the set's scope. The
-            // application field is a sys_scope reference, so its raw value
-            // IS the scope sys_id the apps.current_app preference stores.
+            // Scope selection can reset the session's capture set. Select the
+            // scope first, then the requested set, and verify both picker writes.
+            const scopeSysId = updateSetApp?.value || (typeof updateSetApp === 'string' ? updateSetApp : '');
             let scopeNote = '';
-            try {
-              const scopeSysId = updateSetApp?.value || (typeof updateSetApp === 'string' ? updateSetApp : '');
-              if (scopeSysId) {
-                await setCurrentApplication(app.sdk, userSysID, scopeSysId);
-                const scopeName = updateSetApp?.display_value || updateSetApp;
-                scopeNote = ` — scope switched to ${scopeName}`;
-              }
-            } catch {
-              // scope switch failed — fall back to a warning
-              const currentApp = await getCurrentApplication(app.sdk, userSysID).catch(() => null);
-              scopeNote = scopeMismatchWarning(updateSetApp, currentApp);
+            if (scopeSysId) {
+              await setCurrentApplication(app.sdk, userSysID, scopeSysId);
+              const scopeName = updateSetApp?.display_value || updateSetApp;
+              scopeNote = ` — scope switched to ${scopeName}`;
             }
+            await setCurrentUpdateSet(app.sdk, userSysID, sysID);
 
             app.ok({ update_set: name, sys_id: sysID }, { summary: `Current update set: ${name}${scopeNote}` });
           }),
@@ -631,15 +622,18 @@ export function updateSetsCmd(wrap) {
 
             // Auto-set as current update set
             const sysID = record?.sys_id?.value || record?.sys_id;
+            let selectionNote = '';
             try {
               const userSysID = await requireCurrentUserSysId(app.sdk);
               await setCurrentUpdateSet(app.sdk, userSysID, sysID);
-            } catch {
-              // Non-fatal — auto-set is a convenience, not mandatory
+            } catch (error) {
+              // Creation succeeded. Report partial success without hiding a
+              // failed selection or inviting a duplicate create on retry.
+              selectionNote = `; not selected as current: ${error.message}. Run jsn updatesets set "${argv.name}"`;
             }
 
             app.ok(record, {
-              summary: `Created update set: ${argv.name}`,
+              summary: `Created update set: ${argv.name}${selectionNote}`,
               breadcrumbs: [
                 {
                   action: 'set',

package/src/context.js

@@ -63,25 +63,16 @@ export async function getCurrentUpdateSet(sdk, userSysID) {
   return { name: val, sys_id: val };
 }
 
-/**
- * Find-or-create a sys_user_preference and set its value. Shared by the
- * scope/update-set "set" commands and create auto-set (was copy-pasted 3x).
- */
-async function setUserPreference(sdk, userSysID, name, value) {
-  const params = new URLSearchParams();
-  params.set('sysparm_query', `user=${userSysID}^name=${name}`);
-  params.set('sysparm_limit', '1');
-  params.set('sysparm_fields', 'sys_id');
-  const prefs = await sdk.list('sys_user_preference', params);
-  if (prefs.length > 0) {
-    await sdk.update('sys_user_preference', getStringField(prefs[0], 'sys_id'), { value });
-  } else {
-    await sdk.create('sys_user_preference', {
-      user: userSysID,
-      name,
-      value,
-      type: 'string',
-    });
+// Use the same selection contract as the platform picker. Table API writes to
+// sys_user_preference do not update an already-warmed session's capture context.
+async function selectContext(sdk, picker, data, expected) {
+  const endpoint = `${sdk.baseURL}/api/now/ui/concoursepicker/${picker}`;
+  await sdk.request(endpoint, { method: 'PUT', body: JSON.stringify(data) });
+  const response = await sdk.request(endpoint, { method: 'GET' });
+  const current = response?.result?.current;
+  const actual = picker === 'application' ? current : current?.sysId;
+  if (actual !== expected) {
+    throw new Error(`${picker === 'application' ? 'Application' : 'Update set'} selection was not applied. Expected ${expected}, received ${typeof actual === 'string' ? actual : 'an unreadable selection'}.`);
   }
 }
 
@@ -98,12 +89,12 @@ export async function requireCurrentUserSysId(sdk) {
   return getStringField(user[0], 'sys_id');
 }
 
-/** Set the current application scope via the apps.current_app preference. */
-export async function setCurrentApplication(sdk, userSysID, scopeSysID) {
-  await setUserPreference(sdk, userSysID, 'apps.current_app', scopeSysID);
+/** Select application scope in the authenticated session and verify it. */
+export async function setCurrentApplication(sdk, _userSysID, scopeSysID) {
+  await selectContext(sdk, 'application', { app_id: scopeSysID }, scopeSysID);
 }
 
-/** Set the current update set via the sys_update_set preference. */
-export async function setCurrentUpdateSet(sdk, userSysID, updateSetSysID) {
-  await setUserPreference(sdk, userSysID, 'sys_update_set', updateSetSysID);
+/** Select the capture update set in the authenticated session and verify it. */
+export async function setCurrentUpdateSet(sdk, _userSysID, updateSetSysID) {
+  await selectContext(sdk, 'updateset', { sysId: updateSetSysID }, updateSetSysID);
 }