@aiam/ciba 0.9.8 → 1.0.0

package/ciba.mjs

@@ -289,8 +289,11 @@ async function runCodeFlow(serverUrl, code, opts) {
 
   log('→ Exchanging code...');
 
-  // Wait for the default destination token to land via resources map.
-  const defaultResource = process.env.CIBA_DEFAULT_RESOURCE || 'webagents';
+  // Wait for the default destination token — resolve from server options.
+  const optionsMap2 = deviceDoc.getMap('options');
+  const srvRes2 = optionsMap2.get('resources') ?? {};
+  const defaultResource = Object.keys(srvRes2).find(n => srvRes2[n]?.default)
+    ?? process.env.CIBA_DEFAULT_RESOURCE ?? 'webagents';
   const resourcesMap = deviceDoc.getMap('resources');
 
   const tokenMapName = await firstInYMap(resourcesMap, () => true, TIMEOUT)
@@ -438,7 +441,10 @@ function startDaemon(provider, deviceDoc, privateKey, serverUrl) {
           dlog(`${req.command} cmd attrs=${JSON.stringify(req.attrs)}`);
           const requests = deviceDoc.getMap('requests');
           const resourcesMap = deviceDoc.getMap('resources');
-          const defaultResource = process.env.CIBA_DEFAULT_RESOURCE || 'webagents';
+          const optionsMap = deviceDoc.getMap('options');
+          const serverResources = optionsMap.get('resources') ?? {};
+          const defaultResource = Object.keys(serverResources).find(n => serverResources[n]?.default)
+            ?? process.env.CIBA_DEFAULT_RESOURCE ?? 'webagents';
           const attrs = { ...(req.attrs || {}) };
           const requestedResource = attrs.resource ?? defaultResource;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiam/ciba",
-  "version": "0.9.8",
+  "version": "1.0.0",
   "description": "OAuth 2.0 Device Authorization Grant CLI with cross-device push approval (Yjs sync, ECDH-encrypted token delivery, persistent device id)",
   "type": "module",
   "bin": {

package/token.mjs

@@ -30,7 +30,7 @@ const args = process.argv.slice(2);
 const get = (flag) => { const i = args.indexOf(flag); return i !== -1 ? args[i + 1] : undefined; };
 const has = (flag) => args.includes(flag);
 
-const resource  = get('--resource') ?? process.env.CIBA_DEFAULT_RESOURCE ?? 'webagents';
+const resource  = get('--resource') ?? null; // null = resolve from server options after sync
 const jsonOut   = has('--json');
 const envOut    = has('--env');
 const isRefresh = has('--refresh');
@@ -130,7 +130,7 @@ function tryGet(resourcesMap, deviceDoc, res) {
 
 // ─── Output ───────────────────────────────────────────────────────────────────
 
-function log(msg) { process.stderr.write(msg + '\n'); }
+function log(msg) { if (!jsonOut && !envOut) process.stderr.write(msg + '\n'); }
 
 function output(token) {
   if (jsonOut) {
@@ -147,7 +147,6 @@ function output(token) {
 const { jwt: deviceJwt, deviceId } = signDeviceJwt(privateKey, publicKey);
 log(`→ device:   ${deviceId}`);
 log(`→ server:   ${serverUrl}`);
-log(`→ resource: ${resource}`);
 log('');
 
 const cliUA = `ciba-cli/token (${process.platform} ${process.arch}; node ${process.version})`;
@@ -179,29 +178,29 @@ if (meta.get('public_key') !== publicKey) meta.set('public_key', publicKey);
 const resourcesMap = deviceDoc.getMap('resources');
 const optionsMap = deviceDoc.getMap('options');
 
-// Read server options — resolve short name or use as-is.
-// options.resources = { webagents: { default: true, ... }, a2a: { ... }, ... }
+// Read server options — resolve resource name.
+// options.resources = { webagents: { default: true }, a2a: { ... }, ... }
 const serverResources = optionsMap.get('resources') ?? {};
 const resourceNames = Object.keys(serverResources);
 
-// Resolve the requested resource:
-// 1. If resource matches a short name directly → use it
-// 2. If resource is a URN → use it as-is
-// 3. If no resource → use default from options
-let resolvedResource = resource;
-if (!resource.includes(':') && !resourceNames.includes(resource)) {
-  // Try to find a match case-insensitively
-  const match = resourceNames.find(n => n.toLowerCase() === resource.toLowerCase());
-  if (match) resolvedResource = match;
-}
-if (!resource) {
-  // Use default
+// Resolve:
+// 1. --resource passed and matches a known short name → use it
+// 2. --resource passed as URN → use as-is
+// 3. No --resource → use server default (options.resources[name].default === true)
+// 4. Fallback: first resource name, or 'webagents'
+let resolvedResource;
+if (resource) {
+  // Exact match or case-insensitive short name
+  const match = resourceNames.find(n => n === resource || n.toLowerCase() === resource.toLowerCase());
+  resolvedResource = match ?? resource; // fall back to as-is (URN or unknown)
+} else {
+  // Use server default
   const def = resourceNames.find(n => serverResources[n]?.default);
-  resolvedResource = def ?? resource;
+  resolvedResource = def ?? resourceNames[0] ?? 'webagents';
 }
 
 log(`→ options:   ${JSON.stringify(serverResources)}`);
-log(`→ resolved:  ${resolvedResource}`);
+log(`→ resource:  ${resolvedResource}`);
 log(`→ resources: ${JSON.stringify([...resourcesMap.entries()])}`);
 
 // Refresh mode: write request and exit immediately.