atris 3.58.5 → 3.58.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atris",
-  "version": "3.58.5",
+  "version": "3.58.6",
   "description": "you say what you want in plain words. atris builds it, checks it, and shows you proof.",
   "main": "bin/atris.js",
   "bin": {

package/scripts/det/ytnotes

@@ -8,7 +8,7 @@ set -euo pipefail
 USAGE="usage: ytnotes <youtube-url> [haiku|atris-fast|gemini|grok|codex|cursor]"
 
 case "${1:-}" in
-  *youtube.com*|*youtu.be*) ;;
+  *youtube.com*|*youtu.be*|*youtube-nocookie.com*) ;;
   *) echo "$USAGE" >&2; exit 2 ;;
 esac
 
@@ -20,17 +20,94 @@ WORK="${TMPDIR:-/tmp}/ytnotes"
 mkdir -p "$WORK"
 cd "$WORK"
 
+# Printed metadata and a written English VTT are a hit even when yt-dlp exits 429.
+# Manual English is --write-subs. Auto English is often en-orig / en-US / en-GB.
+# Teach reads the same list on disk. Empty --print still keeps a VTT written
+# in this run (id from the watch / shorts / embed / live / e / nocookie embed URL
+# or the new filename). A copied #t= timestamp is stripped so leftover
+# yt_<id> files still match.
+existing=""
+for name in yt_*.en.vtt yt_*.en-orig.vtt yt_*.en-US.vtt yt_*.en-GB.vtt; do
+  [ -e "$name" ] || continue
+  existing="$existing $name"
+done
+
 META=$(yt-dlp --no-update --quiet --no-warnings --skip-download \
-  --write-auto-subs --sub-format vtt --sub-langs en \
+  --write-subs --write-auto-subs --sub-format vtt --sub-langs "en,en-orig,en-US,en-GB" \
   --no-simulate \
   -o "yt_%(id)s" \
   --print "%(id)s|%(title)s|%(channel)s|%(duration_string)s" \
-  "$URL" 2>/dev/null)
+  "$URL" 2>/dev/null) || true
 ID="${META%%|*}"
 INFO="${META#*|}"
+if [ -z "$ID" ]; then
+  case "$URL" in
+    *'?v='*|*'&v='*)
+      ID="${URL#*'?v='}"
+      if [ "$ID" = "$URL" ]; then
+        ID="${URL#*'&v='}"
+      fi
+      ID="${ID%%&*}"
+      ID="${ID%%\?*}"
+      ;;
+    *'youtu.be/'*)
+      ID="${URL#*'youtu.be/'}"
+      ID="${ID%%\?*}"
+      ID="${ID%%&*}"
+      ID="${ID%%/*}"
+      ;;
+    *'/shorts/'*)
+      ID="${URL#*'/shorts/'}"
+      ID="${ID%%\?*}"
+      ID="${ID%%&*}"
+      ID="${ID%%/*}"
+      ;;
+    *'/embed/'*)
+      ID="${URL#*'/embed/'}"
+      ID="${ID%%\?*}"
+      ID="${ID%%&*}"
+      ID="${ID%%/*}"
+      ;;
+    *'/e/'*)
+      ID="${URL#*'/e/'}"
+      ID="${ID%%\?*}"
+      ID="${ID%%&*}"
+      ID="${ID%%/*}"
+      ;;
+    *'/live/'*)
+      ID="${URL#*'/live/'}"
+      ID="${ID%%\?*}"
+      ID="${ID%%&*}"
+      ID="${ID%%/*}"
+      ;;
+  esac
+  ID="${ID%%#*}"
+fi
 
-VTT="yt_${ID}.en.vtt"
-if [ ! -s "$VTT" ]; then
+VTT=""
+if [ -n "$ID" ]; then
+  for name in "yt_${ID}.en.vtt" "yt_${ID}.en-orig.vtt" "yt_${ID}.en-US.vtt" "yt_${ID}.en-GB.vtt"; do
+    if [ -s "$name" ]; then
+      VTT="$name"
+      break
+    fi
+  done
+fi
+if [ -z "$VTT" ]; then
+  for name in yt_*.en.vtt yt_*.en-orig.vtt yt_*.en-US.vtt yt_*.en-GB.vtt; do
+    [ -s "$name" ] || continue
+    case " $existing " in
+      *" $name "*) continue ;;
+    esac
+    VTT="$name"
+    if [ -z "$ID" ]; then
+      ID="${name#yt_}"
+      ID="${ID%%.*}"
+    fi
+    break
+  done
+fi
+if [ -z "$VTT" ]; then
   echo "No English captions found for $URL. Falling back is manual (atris youtube process, 5 credits)." >&2
   exit 2
 fi

package/utils/auth.js

@@ -352,9 +352,13 @@ function autoSaveProfile(credentials) {
   }
 }
 
-function saveCredentials(token, refreshToken, email, userId, provider) {
+function saveCredentials(token, refreshToken, email, userId, provider, extras = {}) {
+  if (decodeJwtClaims(token)?.type === 'agent_access') {
+    throw new Error('Refusing to save a scoped agent token as the login token; keep it under agent_token');
+  }
   const credentialsPath = getCredentialsPath();
   const credentials = {
+    ...extras,
     token,
     refresh_token: refreshToken || null,
     email: email || null,
@@ -374,7 +378,43 @@ function saveCredentials(token, refreshToken, email, userId, provider) {
   autoSaveProfile(credentials);
 }
 
-function loadCredentials() {
+// Supplying the auth client enables asynchronous repair. Local-only readers stay synchronous.
+function loadCredentials(apiRequestJson) {
+  const credentials = readCredentials();
+  if (!credentials || credentials.source || decodeJwtClaims(credentials.token)?.type !== 'agent_access') {
+    return credentials;
+  }
+  if (!credentials.refresh_token) {
+    console.error('atris login');
+    return credentials;
+  }
+  if (!apiRequestJson) return credentials;
+  return repairLoginCredentials(credentials, apiRequestJson);
+}
+
+async function repairLoginCredentials(credentials, apiRequestJson) {
+  const refreshed = await refreshAccessToken(credentials.refresh_token, null, apiRequestJson);
+  const token = refreshed.data?.access_token;
+  if (!refreshed.ok || !token || decodeJwtClaims(token)?.type === 'agent_access') {
+    throw new Error('Could not repair login file. Run atris login');
+  }
+  const claims = decodeJwtClaims(credentials.token);
+  const { source_profile, ...rest } = credentials;
+  const next = {
+    ...rest,
+    token,
+    refresh_token: refreshed.data.refresh_token || credentials.refresh_token,
+    agent_token: credentials.token,
+    agent_token_scopes: claims.scopes || [],
+    agent_token_expires_at: typeof claims.exp === 'number' ? new Date(claims.exp * 1000).toISOString() : null,
+  };
+  if (source_profile) saveProfile(source_profile, next);
+  else saveCredentials(token, next.refresh_token, next.email, next.user_id, next.provider, next);
+  console.error('Repaired login file: moved a scoped agent token aside.');
+  return { ...next, ...(source_profile ? { source_profile } : {}) };
+}
+
+function readCredentials() {
   // Priority: ATRIS_TOKEN env var → placed agent token → ATRIS_PROFILE env var
   // → per-terminal session file → global credentials.json. A fresh placed token
   // overrides a different env token because cloud images can carry a stale one.
@@ -552,7 +592,7 @@ async function performTokenRefresh(credentials, apiRequestJson) {
         saved_at: new Date().toISOString(),
       });
     } else {
-      saveCredentials(accessToken, newRefreshToken, email, userId, provider);
+      saveCredentials(accessToken, newRefreshToken, email, userId, provider, credentials);
     }
   };
 
@@ -586,7 +626,7 @@ async function performTokenRefresh(credentials, apiRequestJson) {
           saved_at: new Date().toISOString(),
         });
       } else {
-        saveCredentials(accessToken, newRefreshToken, updatedEmail, updatedUserId, updatedProvider);
+        saveCredentials(accessToken, newRefreshToken, updatedEmail, updatedUserId, updatedProvider, credentials);
       }
       latestCreds = loadCredentials();
     }
@@ -603,7 +643,7 @@ async function performTokenRefresh(credentials, apiRequestJson) {
 }
 
 async function ensureValidCredentials(apiRequestJson, options = {}) {
-  let credentials = loadCredentials();
+  let credentials = await loadCredentials(apiRequestJson);
   if (!credentials || !credentials.token) {
     return { error: 'not_logged_in' };
   }
@@ -659,7 +699,8 @@ async function ensureValidCredentials(apiRequestJson, options = {}) {
           credentials.refresh_token,
           updatedEmail,
           updatedUserId,
-          updatedProvider
+          updatedProvider,
+          credentials
         );
       }
     }