publishport-opencli 1.8.5-pp.2 → 1.8.5-pp.21

package/clis/slock/channel-members.js

@@ -1,64 +1 @@
-// channel-members.js
-import { cli, Strategy } from '@jackwener/opencli/registry';
-import { ArgumentError } from '@jackwener/opencli/errors';
-import { buildChannelScopedSnippet } from './in-page.js';
-import { dispatchEvaluateResult } from './errors.js';
-import { SLOCK_SITE, SLOCK_DOMAIN, SLOCK_HOME_URL } from './shared.js';
-
-cli({
-  site: SLOCK_SITE,
-  name: 'channel-members',
-  access: 'read',
-  description: 'List members of a channel',
-  domain: SLOCK_DOMAIN,
-  strategy: Strategy.COOKIE,
-  browser: true,
-  siteSession: 'persistent',
-  args: [
-    { name: 'channel', positional: true, required: true, help: 'channelId UUID or #name' },
-    { name: 'server', help: 'Override active server (slug or id)' },
-  ],
-  columns: ['userId', 'name', 'kind', 'role'],
-  func: async (page, kwargs) => {
-    const channel = String(kwargs.channel ?? '').trim();
-    if (!channel) throw new ArgumentError('channel required');
-    await page.goto(SLOCK_HOME_URL);
-    const snippet = buildChannelScopedSnippet({
-      channelInput: channel,
-      method: 'GET',
-      pathSuffix: '/members',
-      serverIdOverride: kwargs.server,
-    });
-    const result = await page.evaluate(`(async () => { ${snippet} })()`);
-    const data = dispatchEvaluateResult(result);
-    // F2-a — qatester live dump: response is `{ agents: [...], humans: [...] }`,
-    // NOT a flat array and NOT under `.members`. Combine both lists and tag each
-    // row with `kind` so the caller can tell agents from humans. Fall back to
-    // the legacy shapes (`.members` / `.data` / bare array) for forward-compat.
-    let agents = [], humans = [];
-    if (Array.isArray(data)) {
-      humans = data;
-    } else if (data) {
-      agents = Array.isArray(data.agents) ? data.agents : [];
-      humans = Array.isArray(data.humans) ? data.humans : [];
-      if (!agents.length && !humans.length) {
-        const legacy = data.members || data.data || [];
-        humans = Array.isArray(legacy) ? legacy : [];
-      }
-    }
-    return [
-      ...humans.map((m) => ({
-        userId: m.userId ?? m.id ?? '',
-        name: m.name ?? m.username ?? m.displayName ?? '',
-        kind: 'human',
-        role: m.role ?? '',
-      })),
-      ...agents.map((m) => ({
-        userId: m.userId ?? m.id ?? '',
-        name: m.name ?? m.username ?? m.displayName ?? '',
-        kind: 'agent',
-        role: m.status ?? m.activity ?? '',
-      })),
-    ];
-  },
-});
+import{cli as V,Strategy as W}from"@jackwener/opencli/registry";import{ArgumentError as X}from"@jackwener/opencli/errors";import{buildChannelScopedSnippet as Y}from"./in-page.js";import{dispatchEvaluateResult as Z}from"./errors.js";import{SLOCK_SITE as $,SLOCK_DOMAIN as v,SLOCK_HOME_URL as D}from"./shared.js";V({site:$,name:"channel-members",access:"read",description:"List members of a channel",domain:v,strategy:W.COOKIE,browser:!0,siteSession:"persistent",args:[{name:"channel",positional:!0,required:!0,help:"channelId UUID or #name"},{name:"server",help:"Override active server (slug or id)"}],columns:["userId","name","kind","role"],func:async(F,G)=>{const J=String(G.channel??"").trim();if(!J)throw new X("channel required");await F.goto(D);const P=Y({channelInput:J,method:"GET",pathSuffix:"/members",serverIdOverride:G.server}),Q=await F.evaluate(`(async () => { ${P} })()`),x=Z(Q);let B=[],z=[];if(Array.isArray(x))z=x;else if(x){B=Array.isArray(x.agents)?x.agents:[];z=Array.isArray(x.humans)?x.humans:[];if(!B.length&&!z.length){const q=x.members||x.data||[];z=Array.isArray(q)?q:[]}}return[...z.map((q)=>({userId:q.userId??q.id??"",name:q.name??q.username??q.displayName??"",kind:"human",role:q.role??""})),...B.map((q)=>({userId:q.userId??q.id??"",name:q.name??q.username??q.displayName??"",kind:"agent",role:q.status??q.activity??""}))]}});

package/clis/slock/channel-unarchive.js

@@ -1,11 +1 @@
-// channel-unarchive.js
-import { makeChannelActionCommand } from './channel-action.js';
-
-makeChannelActionCommand({
-  name: 'channel-unarchive',
-  verb: 'unarchive',
-  resultLabel: 'unarchived',
-  description: 'Unarchive a channel — admin only (POST /channels/:id/unarchive). ' +
-    '#name lookups exclude archived channels; pass the channelId UUID for archived ones.',
-  archivedHint: true,
-});
+import{makeChannelActionCommand as n}from"./channel-action.js";n({name:"channel-unarchive",verb:"unarchive",resultLabel:"unarchived",description:"Unarchive a channel — admin only (POST /channels/:id/unarchive). "+"#name lookups exclude archived channels; pass the channelId UUID for archived ones.",archivedHint:!0});

package/clis/slock/dm-list.js

@@ -1,41 +1 @@
-// dm-list.js
-import { cli, Strategy } from '@jackwener/opencli/registry';
-import { CommandExecutionError } from '@jackwener/opencli/errors';
-import { buildFetchSnippet } from './in-page.js';
-import { dispatchEvaluateResult } from './errors.js';
-import { SLOCK_SITE, SLOCK_DOMAIN, SLOCK_HOME_URL } from './shared.js';
-
-cli({
-  site: SLOCK_SITE,
-  name: 'dm-list',
-  access: 'read',
-  description: 'List DM channels in the active server (GET /channels/dm)',
-  domain: SLOCK_DOMAIN,
-  strategy: Strategy.COOKIE,
-  browser: true,
-  siteSession: 'persistent',
-  args: [
-    { name: 'server', help: 'Override active server (slug or id)' },
-  ],
-  columns: ['channelId', 'peerName', 'peerId', 'createdAt'],
-  func: async (page, kwargs) => {
-    await page.goto(SLOCK_HOME_URL);
-    const snippet = buildFetchSnippet({
-      method: 'GET',
-      path: '/channels/dm',
-      serverScoped: true,
-      serverIdOverride: kwargs.server,
-    });
-    const result = await page.evaluate(`(async () => { ${snippet} })()`);
-    const rows = dispatchEvaluateResult(result);
-    if (!Array.isArray(rows)) {
-      throw new CommandExecutionError(`expected array of DM channels, got ${typeof rows} (contract drift?)`);
-    }
-    return rows.map((c) => ({
-      channelId: c.id ?? '',
-      peerName: c.peerDisplayName ?? c.peerName ?? c.name ?? '',
-      peerId: c.peerId ?? '',
-      createdAt: c.createdAt ?? '',
-    }));
-  },
-});
+import{cli as n,Strategy as o}from"@jackwener/opencli/registry";import{CommandExecutionError as d}from"@jackwener/opencli/errors";import{buildFetchSnippet as m}from"./in-page.js";import{dispatchEvaluateResult as p}from"./errors.js";import{SLOCK_SITE as c,SLOCK_DOMAIN as l,SLOCK_HOME_URL as h}from"./shared.js";n({site:c,name:"dm-list",access:"read",description:"List DM channels in the active server (GET /channels/dm)",domain:l,strategy:o.COOKIE,browser:!0,siteSession:"persistent",args:[{name:"server",help:"Override active server (slug or id)"}],columns:["channelId","peerName","peerId","createdAt"],func:async(t,a)=>{await t.goto(h);const s=m({method:"GET",path:"/channels/dm",serverScoped:!0,serverIdOverride:a.server}),i=await t.evaluate(`(async () => { ${s} })()`),r=p(i);if(!Array.isArray(r))throw new d(`expected array of DM channels, got ${typeof r} (contract drift?)`);return r.map((e)=>({channelId:e.id??"",peerName:e.peerDisplayName??e.peerName??e.name??"",peerId:e.peerId??"",createdAt:e.createdAt??""}))}});

package/clis/slock/errors.js

@@ -1,30 +1 @@
-import { ArgumentError, AuthRequiredError, CommandExecutionError, ConfigError } from '@jackwener/opencli/errors';
-import { SLOCK_DOMAIN } from './shared.js';
-
-// EvaluateResult is the envelope every in-page snippet returns. Kinds:
-//   { kind: 'ok', rows, meta? }
-//   { kind: 'auth', detail }
-//   { kind: 'http', status, where }
-//   { kind: 'no-server', detail }
-//   { kind: 'unresolvable', detail }
-//   { kind: 'no-thread', parent }       // handled by caller, never reaches dispatcher
-export function dispatchEvaluateResult(r) {
-  switch (r && r.kind) {
-    case 'ok':
-      return r.rows;
-    case 'auth':
-      throw new AuthRequiredError(SLOCK_DOMAIN, r.detail);
-    case 'http':
-      throw new CommandExecutionError(`HTTP ${r.status} from ${r.where}`);
-    case 'no-server':
-      throw new ConfigError(r.detail, 'Run `opencli slock server-use <slug>` to set the active server.');
-    case 'unresolvable':
-      throw new ArgumentError(r.detail);
-    case 'no-thread':
-      // caller decides what to do (returns a 0-row hint); should never reach here
-      throw new CommandExecutionError(`no-thread should be handled by caller, not dispatcher: ${r.parent}`);
-    default:
-      // unknown / null envelope = contract drift; fail loud (reddit precedent)
-      throw new CommandExecutionError(`unexpected evaluate envelope: ${JSON.stringify(r)}`);
-  }
-}
+import{ArgumentError as z,AuthRequiredError as B,CommandExecutionError as y,ConfigError as F}from"@jackwener/opencli/errors";import{SLOCK_DOMAIN as G}from"./shared.js";export function dispatchEvaluateResult(b){switch(b&&b.kind){case"ok":return b.rows;case"auth":throw new B(G,b.detail);case"http":throw new y(`HTTP ${b.status} from ${b.where}`);case"no-server":throw new F(b.detail,"Run `opencli slock server-use <slug>` to set the active server.");case"unresolvable":throw new z(b.detail);case"no-thread":throw new y(`no-thread should be handled by caller, not dispatcher: ${b.parent}`);default:throw new y(`unexpected evaluate envelope: ${JSON.stringify(b)}`)}}

package/clis/slock/in-page.js

@@ -1,40 +1,11 @@
-import { UUID_RE } from './resolve.js';
-import { SLOCK_API_BASE } from './shared.js';
-
-// ── Reusable in-page snippet fragments ──────────────────────────────────────
-// Every slock command runs a string of JS inside the logged-in page via
-// page.evaluate. The auth handshake (read token from localStorage), the
-// server-scope resolution (slug → X-Server-Id), and the channel-name → id
-// lookup were copy-pasted into every command. These fragments are the single
-// source of truth so a new command composes them instead of re-deriving them.
-//
-// Envelope contract (what a snippet returns):
-//   { kind: 'ok', rows, meta? }   { kind: 'auth', detail }
-//   { kind: 'http', status, where }   { kind: 'no-server', detail }
-//   { kind: 'unresolvable', detail }
-// See errors.js#dispatchEvaluateResult for how these map to typed errors.
-
-// Emits JS that leaves `token`, `sid` (null unless server-scoped) and `headers`
-// in scope on success, or `return`s an error envelope. Run it first in a snippet.
-export function authHeadersFragment({ serverScoped = false, serverIdOverride = null } = {}) {
-  // R1 — `--server <slug>` was being passed raw as X-Server-Id. The server
-  // only accepts UUIDs, so a slug override returned 500 from /channels/ and
-  // friends. Now: a UUID override is used directly; a slug override is
-  // resolved against /servers/ the same way the active-slug path does
-  // (single source of truth for slug→id). If neither override nor
-  // active-slug yields a known server, we fail loud with `no-server`.
-  // Source-verified (Bugen): /servers/ returns rows of { id, slug, name }.
-  const overrideStr = serverIdOverride ? JSON.stringify(serverIdOverride) : 'null';
-  const UUID_RE_SRC = '^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$';
-  const resolveServer = serverScoped
-    ? `
+import{UUID_RE as T}from"./resolve.js";import{SLOCK_API_BASE as Q}from"./shared.js";export function authHeadersFragment({serverScoped:k=!1,serverIdOverride:z=null}={}){const G=z?JSON.stringify(z):"null",M="^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$",N=k?`
     if (!sid) {
       // Determine the slug to look up: override slug (if not a UUID) wins,
       // otherwise fall back to the active slug from localStorage.
-      const __override = ${overrideStr};
+      const __override = ${G};
       const __slug = __override ?? localStorage.getItem('slock_last_server_slug');
       if (!__slug) return { kind: 'no-server', detail: 'no --server override and localStorage.slock_last_server_slug is empty; run \`slock server-use <slug>\` or pass --server <slug>' };
-      const sres = await fetch('${SLOCK_API_BASE}/servers/', {
+      const sres = await fetch('${Q}/servers/', {
         method: 'GET', credentials: 'include',
         headers: { authorization: 'Bearer ' + token, accept: 'application/json' },
       });
@@ -48,14 +19,7 @@ export function authHeadersFragment({ serverScoped = false, serverIdOverride = n
         return { kind: 'no-server', detail: 'slug "' + __slug + '" not in /servers/' + (__override ? ' (--server)' : ' (active)') + '. Known slugs: ' + __choices };
       }
       sid = sm.id;
-    }`
-    : '';
-  // Node-side gate: if the override looks like a UUID, set sid directly and
-  // skip the lookup. Otherwise emit `let sid = null;` so the resolveServer
-  // block runs and treats the override (or active slug) uniformly.
-  const isUuidOverride = !!serverIdOverride && new RegExp(UUID_RE_SRC).test(String(serverIdOverride));
-  const sidInit = isUuidOverride ? overrideStr : 'null';
-  return `
+    }`:"";return`
     // Page-readiness loop: page.goto can return before the SPA's first navigation
     // settles, leaving location on an opaque interstitial (about:blank, redirector,
     // etc.). Reading localStorage there throws SecurityError "Access is denied".
@@ -94,120 +58,56 @@ export function authHeadersFragment({ serverScoped = false, serverIdOverride = n
     }
     const token = localStorage.getItem('slock_access_token');
     if (!token) return { kind: 'auth', detail: 'no access token in localStorage' };
-    let sid = ${sidInit};${resolveServer}
+    let sid = ${!!z&&new RegExp(M).test(String(z))?G:"null"};${N}
     const headers = {
       authorization: 'Bearer ' + token,
       accept: 'application/json',
       'content-type': 'application/json',
     };
     if (sid) headers['x-server-id'] = sid;
-  `;
-}
-
-// Emits JS that declares and sets `channelId` from a channel input that is
-// either a UUID (passthrough) or a "#name"/"name" (case-insensitive lookup
-// against GET /channels/). Requires `headers` from authHeadersFragment. On a
-// miss it `return`s { kind: 'unresolvable' }.
-export function channelResolveFragment(channelInput) {
-  const raw = String(channelInput ?? '');
-  const isUuid = UUID_RE.test(raw);
-  const rawJson = JSON.stringify(raw);
-  const nameJson = JSON.stringify(raw.replace(/^#/, '').toLowerCase());
-  return `
+  `}export function channelResolveFragment(k){const z=String(k??""),G=T.test(z),M=JSON.stringify(z),N=JSON.stringify(z.replace(/^#/,"").toLowerCase());return`
     let channelId;
-    if (${isUuid}) {
-      channelId = ${rawJson};
+    if (${G}) {
+      channelId = ${M};
     } else {
-      const cres = await fetch('${SLOCK_API_BASE}/channels/', { credentials: 'include', headers });
+      const cres = await fetch('${Q}/channels/', { credentials: 'include', headers });
       if (cres.status === 401) return { kind: 'auth', detail: '/channels/ returned 401' };
       if (!cres.ok) return { kind: 'http', status: cres.status, where: '/channels/' };
       const carr = await cres.json();
       const clist = Array.isArray(carr) ? carr : (carr.channels || carr.data || []);
-      const chit = clist.find((c) => (c.name || c.slug || '').toLowerCase() === ${nameJson});
-      if (!chit) return { kind: 'unresolvable', detail: 'no channel matches ' + ${nameJson} };
+      const chit = clist.find((c) => (c.name || c.slug || '').toLowerCase() === ${N});
+      if (!chit) return { kind: 'unresolvable', detail: 'no channel matches ' + ${N} };
       channelId = chit.id;
     }
-  `;
-}
-
-// Emits JS that expands a "#channel:shortId" short message id into the full
-// messageId UUID via GET /api/messages/context/:shortId?channelId=<id>.
-//
-// Phase 7.1 invariant (kept across rewrites): read `cxd.targetMessageId`,
-// NOT `m.message.id`. The latter is the closest-message-in-context object,
-// which can be a neighbor when the short id is just a prefix — Phase 7.1
-// bug class. Also: 404 from /messages/context means short id not found
-// in that channel — caller should map it to `unresolvable`, distinct from
-// other 404s in surrounding logic (threads-404 / channel-404 mean
-// different things).
-//
-// `shortIdVar` is mutated in-place: on success it holds the resolved UUID.
-//
-// opts:
-//   shortIdVar          name of the JS variable holding the short id (mutated)
-//   parentChannelIdVar  name of the JS variable holding the parent channelId
-//   contextDescription  optional `JSON.stringify`'d JS expression that
-//                       evaluates to a string used in the "not found" detail
-//                       (e.g. `"#general"` becomes `' in #' + 'general'`).
-//                       Pass `"''"` to omit the suffix entirely.
-//
-// Drift-guarded by clis/slock/short-id-canary.test.js — any other file that
-// hand-rolls `cxd.targetMessageId` short-id resolution fails the canary.
-export function resolveShortIdFragment({ shortIdVar, parentChannelIdVar, contextDescription = "''" }) {
-  return `
-    if (!/^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(${shortIdVar})) {
-      const cx = await fetch('${SLOCK_API_BASE}/messages/context/' + encodeURIComponent(${shortIdVar}) + '?channelId=' + encodeURIComponent(${parentChannelIdVar}), { credentials:'include', headers });
+  `}export function resolveShortIdFragment({shortIdVar:k,parentChannelIdVar:z,contextDescription:G="''"}){return`
+    if (!/^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(${k})) {
+      const cx = await fetch('${Q}/messages/context/' + encodeURIComponent(${k}) + '?channelId=' + encodeURIComponent(${z}), { credentials:'include', headers });
       if (cx.status === 404) {
-        const __ctx = ${contextDescription};
-        return { kind: 'unresolvable', detail: 'short id "' + ${shortIdVar} + '" not found' + (__ctx ? ' in #' + __ctx : '') };
+        const __ctx = ${G};
+        return { kind: 'unresolvable', detail: 'short id "' + ${k} + '" not found' + (__ctx ? ' in #' + __ctx : '') };
       }
       if (!cx.ok) return { kind: cx.status===401?'auth':'http', status: cx.status, where:'/messages/context' };
       const cxd = await cx.json();
       // CRITICAL — read targetMessageId, NOT m.message.id (Phase 7.1).
-      ${shortIdVar} = cxd.targetMessageId;
+      ${k} = cxd.targetMessageId;
     }
-  `;
-}
-
-// opts: { method, path, body?, serverScoped, serverIdOverride? }
-//   method      'GET' | 'POST' | 'DELETE' | 'PATCH'
-//   serverScoped  when true, resolve slug→id and send X-Server-Id
-//   serverIdOverride  if set, skip the localStorage slug lookup for this call
-// Single fetch to a fixed path. Use buildChannelScopedSnippet when the path
-// depends on a channel that must first be resolved from a name.
-export function buildFetchSnippet(opts) {
-  const method = JSON.stringify(opts.method);
-  const path = JSON.stringify(SLOCK_API_BASE + opts.path);
-  const bodyJson = opts.body === undefined ? 'undefined' : JSON.stringify(JSON.stringify(opts.body));
-  return `
-    ${authHeadersFragment({ serverScoped: opts.serverScoped, serverIdOverride: opts.serverIdOverride })}
-    const res = await fetch(${path}, {
-      method: ${method}, credentials: 'include', headers,
-      body: ${bodyJson},
+  `}export function buildFetchSnippet(k){const z=JSON.stringify(k.method),G=JSON.stringify(Q+k.path),M=k.body===void 0?"undefined":JSON.stringify(JSON.stringify(k.body));return`
+    ${authHeadersFragment({serverScoped:k.serverScoped,serverIdOverride:k.serverIdOverride})}
+    const res = await fetch(${G}, {
+      method: ${z}, credentials: 'include', headers,
+      body: ${M},
     });
-    if (res.status === 401) return { kind: 'auth', detail: ${path} + ' returned 401' };
-    if (!res.ok) return { kind: 'http', status: res.status, where: ${path} };
+    if (res.status === 401) return { kind: 'auth', detail: ${G} + ' returned 401' };
+    if (!res.ok) return { kind: 'http', status: res.status, where: ${G} };
     const data = await res.json().catch(() => ({}));
     return { kind: 'ok', rows: data };
-  `;
-}
-
-// opts: { channelInput, method, pathSuffix?, body?, query?, serverIdOverride? }
-// Resolves channelInput (uuid or #name) then fetches /channels/:id<pathSuffix><query>.
-// Always server-scoped. `query` (if given) must include its leading '?'.
-export function buildChannelScopedSnippet(opts) {
-  const method = JSON.stringify(opts.method);
-  const suffix = JSON.stringify(opts.pathSuffix || '');
-  const query = opts.query ? JSON.stringify(opts.query) : "''";
-  const bodyJson = opts.body === undefined ? 'undefined' : JSON.stringify(JSON.stringify(opts.body));
-  return `
-    ${authHeadersFragment({ serverScoped: true, serverIdOverride: opts.serverIdOverride })}
-    ${channelResolveFragment(opts.channelInput)}
-    const __url = '${SLOCK_API_BASE}/channels/' + encodeURIComponent(channelId) + ${suffix} + ${query};
-    const res = await fetch(__url, { method: ${method}, credentials: 'include', headers, body: ${bodyJson} });
+  `}export function buildChannelScopedSnippet(k){const z=JSON.stringify(k.method),G=JSON.stringify(k.pathSuffix||""),M=k.query?JSON.stringify(k.query):"''",N=k.body===void 0?"undefined":JSON.stringify(JSON.stringify(k.body));return`
+    ${authHeadersFragment({serverScoped:!0,serverIdOverride:k.serverIdOverride})}
+    ${channelResolveFragment(k.channelInput)}
+    const __url = '${Q}/channels/' + encodeURIComponent(channelId) + ${G} + ${M};
+    const res = await fetch(__url, { method: ${z}, credentials: 'include', headers, body: ${N} });
     if (res.status === 401) return { kind: 'auth', detail: __url + ' returned 401' };
     if (!res.ok) return { kind: 'http', status: res.status, where: __url };
     const data = await res.json().catch(() => ({}));
     return { kind: 'ok', rows: data };
-  `;
-}
+  `}

package/clis/slock/inbox-done.js

@@ -1,40 +1,9 @@
-// inbox-done.js
-import { cli, Strategy } from '@jackwener/opencli/registry';
-import { ArgumentError } from '@jackwener/opencli/errors';
-import { authHeadersFragment, channelResolveFragment } from './in-page.js';
-import { dispatchEvaluateResult } from './errors.js';
-import { SLOCK_SITE, SLOCK_DOMAIN, SLOCK_HOME_URL, SLOCK_API_BASE } from './shared.js';
-
-cli({
-  site: SLOCK_SITE,
-  name: 'inbox-done',
-  access: 'write',
-  description: 'Mark one chat as done / clear it from the inbox (POST /channels/inbox/done)',
-  domain: SLOCK_DOMAIN,
-  strategy: Strategy.COOKIE,
-  browser: true,
-  siteSession: 'persistent',
-  args: [
-    { name: 'channel', positional: true, required: true, help: 'channelId UUID or #name' },
-    { name: 'server', help: 'Override active server' },
-  ],
-  columns: ['channel', 'result'],
-  func: async (page, kwargs) => {
-    const channel = String(kwargs.channel ?? '').trim();
-    if (!channel) throw new ArgumentError('channel required');
-    await page.goto(SLOCK_HOME_URL);
-    // channelId travels in the BODY (not the URL), so resolve then POST the fixed path.
-    const snippet = `
-      ${authHeadersFragment({ serverScoped: true, serverIdOverride: kwargs.server })}
-      ${channelResolveFragment(channel)}
-      const res = await fetch('${SLOCK_API_BASE}/channels/inbox/done', { method:'POST', credentials:'include', headers, body: JSON.stringify({ channelId }) });
+import{cli as Q,Strategy as V}from"@jackwener/opencli/registry";import{ArgumentError as W}from"@jackwener/opencli/errors";import{authHeadersFragment as X,channelResolveFragment as Z}from"./in-page.js";import{dispatchEvaluateResult as $}from"./errors.js";import{SLOCK_SITE as f,SLOCK_DOMAIN as x,SLOCK_HOME_URL as N,SLOCK_API_BASE as Y}from"./shared.js";Q({site:f,name:"inbox-done",access:"write",description:"Mark one chat as done / clear it from the inbox (POST /channels/inbox/done)",domain:x,strategy:V.COOKIE,browser:!0,siteSession:"persistent",args:[{name:"channel",positional:!0,required:!0,help:"channelId UUID or #name"},{name:"server",help:"Override active server"}],columns:["channel","result"],func:async(q,z)=>{const b=String(z.channel??"").trim();if(!b)throw new W("channel required");await q.goto(N);const G=`
+      ${X({serverScoped:!0,serverIdOverride:z.server})}
+      ${Z(b)}
+      const res = await fetch('${Y}/channels/inbox/done', { method:'POST', credentials:'include', headers, body: JSON.stringify({ channelId }) });
       if (res.status === 401) return { kind: 'auth', detail: '/channels/inbox/done returned 401' };
       if (!res.ok) return { kind: 'http', status: res.status, where:'/channels/inbox/done' };
       const data = await res.json().catch(() => ({}));
       return { kind: 'ok', rows: data };
-    `;
-    const result = await page.evaluate(`(async () => { ${snippet} })()`);
-    dispatchEvaluateResult(result);
-    return [{ channel, result: 'done' }];
-  },
-});
+    `,J=await q.evaluate(`(async () => { ${G} })()`);$(J);return[{channel:b,result:"done"}]}});

package/clis/slock/inbox-read-all.js

@@ -1,32 +1 @@
-// inbox-read-all.js
-import { cli, Strategy } from '@jackwener/opencli/registry';
-import { buildFetchSnippet } from './in-page.js';
-import { dispatchEvaluateResult } from './errors.js';
-import { SLOCK_SITE, SLOCK_DOMAIN, SLOCK_HOME_URL } from './shared.js';
-
-cli({
-  site: SLOCK_SITE,
-  name: 'inbox-read-all',
-  access: 'write',
-  description: 'Mark the entire inbox as read (POST /channels/inbox/read-all)',
-  domain: SLOCK_DOMAIN,
-  strategy: Strategy.COOKIE,
-  browser: true,
-  siteSession: 'persistent',
-  args: [
-    { name: 'server', help: 'Override active server' },
-  ],
-  columns: ['result', 'markedCount'],
-  func: async (page, kwargs) => {
-    await page.goto(SLOCK_HOME_URL);
-    const snippet = buildFetchSnippet({
-      method: 'POST',
-      path: '/channels/inbox/read-all',
-      serverScoped: true,
-      serverIdOverride: kwargs.server,
-    });
-    const result = await page.evaluate(`(async () => { ${snippet} })()`);
-    const data = dispatchEvaluateResult(result);
-    return [{ result: 'read-all', markedCount: data?.markedCount ?? null }];
-  },
-});
+import{cli as s,Strategy as n}from"@jackwener/opencli/registry";import{buildFetchSnippet as i}from"./in-page.js";import{dispatchEvaluateResult as o}from"./errors.js";import{SLOCK_SITE as l,SLOCK_DOMAIN as d,SLOCK_HOME_URL as c}from"./shared.js";s({site:l,name:"inbox-read-all",access:"write",description:"Mark the entire inbox as read (POST /channels/inbox/read-all)",domain:d,strategy:n.COOKIE,browser:!0,siteSession:"persistent",args:[{name:"server",help:"Override active server"}],columns:["result","markedCount"],func:async(e,r)=>{await e.goto(c);const t=i({method:"POST",path:"/channels/inbox/read-all",serverScoped:!0,serverIdOverride:r.server}),a=await e.evaluate(`(async () => { ${t} })()`);return[{result:"read-all",markedCount:o(a)?.markedCount??null}]}});

package/clis/slock/inbox.js

@@ -1,74 +1 @@
-// inbox.js
-import { cli, Strategy } from '@jackwener/opencli/registry';
-import { ArgumentError, CommandExecutionError } from '@jackwener/opencli/errors';
-import { buildFetchSnippet } from './in-page.js';
-import { dispatchEvaluateResult } from './errors.js';
-import { SLOCK_SITE, SLOCK_DOMAIN, SLOCK_HOME_URL } from './shared.js';
-import { parseNonNegativeInteger, parsePositiveInteger } from './resolve.js';
-
-const FILTERS = ['all', 'unread', 'mentions'];
-
-// InboxItem is a union: channel/dm items vs thread items. Flatten both into a
-// uniform row so the table is stable regardless of kind.
-function mapItem(it) {
-  if (it.kind === 'thread') {
-    return {
-      kind: 'thread',
-      id: it.threadChannelId ?? '',
-      name: it.parentChannelName ?? '',
-      unreadCount: typeof it.unreadCount === 'number' ? it.unreadCount : 0,
-      hasMention: !!it.hasMention,
-      lastActivityAt: it.lastActivityAt ?? it.lastReplyAt ?? '',
-      preview: it.latestActivityPreview ?? it.parentMessagePreview ?? '',
-    };
-  }
-  return {
-    kind: it.kind ?? 'channel',
-    id: it.channelId ?? '',
-    name: it.channelName ?? '',
-    unreadCount: typeof it.unreadCount === 'number' ? it.unreadCount : 0,
-    hasMention: !!it.hasMention,
-    lastActivityAt: it.lastMessageAt ?? '',
-    preview: it.lastMessagePreview ?? '',
-  };
-}
-
-cli({
-  site: SLOCK_SITE,
-  name: 'inbox',
-  access: 'read',
-  description: 'List unified inbox items (channels, DMs, followed threads) that need attention.',
-  domain: SLOCK_DOMAIN,
-  strategy: Strategy.COOKIE,
-  browser: true,
-  siteSession: 'persistent',
-  args: [
-    { name: 'filter', default: 'all', help: 'all | unread | mentions' },
-    { name: 'limit', type: 'int', default: 30, help: 'Max items (server caps at 100)' },
-    { name: 'offset', type: 'int', default: 0, help: 'Pagination offset' },
-    { name: 'server', help: 'Override active server' },
-  ],
-  columns: ['kind', 'id', 'name', 'unreadCount', 'hasMention', 'lastActivityAt', 'preview'],
-  func: async (page, kwargs) => {
-    const filter = String(kwargs.filter ?? 'all').toLowerCase();
-    if (!FILTERS.includes(filter)) {
-      throw new ArgumentError(`--filter must be one of ${FILTERS.join(' | ')} (got "${filter}")`);
-    }
-    const limit = parsePositiveInteger(kwargs.limit, '--limit', { defaultValue: 30, max: 100 });
-    const offset = parseNonNegativeInteger(kwargs.offset, '--offset', { defaultValue: 0 });
-    await page.goto(SLOCK_HOME_URL);
-    const snippet = buildFetchSnippet({
-      method: 'GET',
-      path: `/channels/inbox?filter=${encodeURIComponent(filter)}&limit=${limit}&offset=${offset}`,
-      serverScoped: true,
-      serverIdOverride: kwargs.server,
-    });
-    const result = await page.evaluate(`(async () => { ${snippet} })()`);
-    const data = dispatchEvaluateResult(result);
-    const items = Array.isArray(data) ? data : (data.items || []);
-    if (!Array.isArray(items)) {
-      throw new CommandExecutionError(`expected inbox items array, got ${typeof items} (contract drift?)`);
-    }
-    return items.map(mapItem);
-  },
-});
+import{cli as Z,Strategy as $}from"@jackwener/opencli/registry";import{ArgumentError as x,CommandExecutionError as D}from"@jackwener/opencli/errors";import{buildFetchSnippet as H}from"./in-page.js";import{dispatchEvaluateResult as P}from"./errors.js";import{SLOCK_SITE as U,SLOCK_DOMAIN as y,SLOCK_HOME_URL as A}from"./shared.js";import{parseNonNegativeInteger as M,parsePositiveInteger as b}from"./resolve.js";const Q=["all","unread","mentions"];function F(q){if(q.kind==="thread")return{kind:"thread",id:q.threadChannelId??"",name:q.parentChannelName??"",unreadCount:typeof q.unreadCount==="number"?q.unreadCount:0,hasMention:!!q.hasMention,lastActivityAt:q.lastActivityAt??q.lastReplyAt??"",preview:q.latestActivityPreview??q.parentMessagePreview??""};return{kind:q.kind??"channel",id:q.channelId??"",name:q.channelName??"",unreadCount:typeof q.unreadCount==="number"?q.unreadCount:0,hasMention:!!q.hasMention,lastActivityAt:q.lastMessageAt??"",preview:q.lastMessagePreview??""}}Z({site:U,name:"inbox",access:"read",description:"List unified inbox items (channels, DMs, followed threads) that need attention.",domain:y,strategy:$.COOKIE,browser:!0,siteSession:"persistent",args:[{name:"filter",default:"all",help:"all | unread | mentions"},{name:"limit",type:"int",default:30,help:"Max items (server caps at 100)"},{name:"offset",type:"int",default:0,help:"Pagination offset"},{name:"server",help:"Override active server"}],columns:["kind","id","name","unreadCount","hasMention","lastActivityAt","preview"],func:async(q,z)=>{const B=String(z.filter??"all").toLowerCase();if(!Q.includes(B))throw new x(`--filter must be one of ${Q.join(" | ")} (got "${B}")`);const V=b(z.limit,"--limit",{defaultValue:30,max:100}),W=M(z.offset,"--offset",{defaultValue:0});await q.goto(A);const X=H({method:"GET",path:`/channels/inbox?filter=${encodeURIComponent(B)}&limit=${V}&offset=${W}`,serverScoped:!0,serverIdOverride:z.server}),Y=await q.evaluate(`(async () => { ${X} })()`),G=P(Y),J=Array.isArray(G)?G:G.items||[];if(!Array.isArray(J))throw new D(`expected inbox items array, got ${typeof J} (contract drift?)`);return J.map(F)}});

package/clis/slock/login.js

@@ -1,3 +1 @@
-// login.js — site-auth already registers `login` alongside `whoami`;
-// this file is a side-effect import so `opencli slock login` resolves.
-import './whoami.js';
+import"./whoami.js";