Skip to content

feat: inherit CIRISAgent 2.9.41's client work — superset restored #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emooreatx merged 13 commits into from
Aug 28, 2026
Merged

feat: inherit CIRISAgent 2.9.41's client work — superset restored #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0e268f0
feat: inherit CIRISAgent 2.9.41's client work — superset restored
emooreatx Aug 28, 2026
7603769
fix: three holes in the inherited fixes — two of them P1
emooreatx Aug 28, 2026
f2d1103
fix: both round-one fixes were written against the example, not the q…
emooreatx Aug 28, 2026
c94ab84
fix: the redactor was blind to the names this codebase actually uses
emooreatx Aug 28, 2026
43ac4ae
fix: the redactor crashed on web, ignored short secrets, and reset st…
emooreatx Aug 28, 2026
bc1920f
fix(reset): name the button after what it does, and delete the machin…
emooreatx Aug 28, 2026
847d4d3
fix(bundle): the JWT arm had a segment-length floor too
emooreatx Aug 28, 2026
be259d4
Merge remote-tracking branch 'origin/main' into feat/inherit-agent-2.…
emooreatx Aug 28, 2026
b6e880a
fix(i18n): "local" was the untranslatable word, not the sentence
emooreatx Aug 28, 2026
531e168
i18n: evaluate lane (translate -> evaluate -> repair)
github-actions[bot] Aug 28, 2026
d370ef1
Merge remote-tracking branch 'origin/main' into feat/inherit-agent-2.…
emooreatx Aug 28, 2026
50e21c1
fix(bundle): the claim PIN was in the bundle, and the GitHub issue pa…
emooreatx Aug 28, 2026
4c52620
fix(reset): a device-local reset must ask the device-local node
emooreatx Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/VENDORING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ source is the pair a bisect wants:
The tree's current recorded state — sha256-of-sha256s over every git-tracked
file under `client/` except this one:

**state digest:** `be1f4ba8990a3b289cc30f414e91ea7524fd1444160340308ffb8dc5a25dba68`
**state digest:** `0ff13365d8b1b367cd9bc382f0b89e2bc51200dc0629ed93523b049020e147a8`

@chatgpt-codex-connector chatgpt-codex-connector Bot Aug 28, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Record the 2.9.41 upstream merge state

This commit says it inherited CIRISAgent 2.9.41's client tree and re-seals that result with this digest, but the provenance table at VENDORING.md:25 still records 2.9.36 as the agent's last merged state. Section 8 starts the next upstream pull from exactly that recorded commit, so the next pull will replay the already-integrated 2.9.37–2.9.41 changes and can produce avoidable conflicts or incorrect resolutions instead of using the actual branch point; update the agent state, input commit, and pull date alongside the digest.

Useful? React with 👍 / 👎.


`packaging/check_vendoring.py` asserts it on every push, and refuses any
tracked file matching a §2 never-vendor class. **Any commit that touches
Expand Down
6 changes: 3 additions & 3 deletions client/androidApp/src/main/assets/localization/am.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1858,10 +1858,10 @@
"login_owner_hint": "መጨረሻ የገባው: {owner}",
"login_password_label": "የይለፍ ቃል",
"login_privacy": "የግላዊነት መመሪያን ይመልከቱ",
"login_reset_device": "መሣሪያ ዳግም አስጀምር",
"login_reset_device": "ይህን መሣሪያ ዳግም አስጀምር",
"login_reset_device_cancel": "ሰርዝ",
"login_reset_device_confirm_body": "ይህ ሁሉንም አካባቢያዊ ውሂብ ያጠፋና ወደ ማዋቀሪያ አዋቂ ይመልሳል። ይህ ድርጊት ሊቀለበስ አይችልም።",
"login_reset_device_confirm_title": "መሣሪያ ዳግም ይጀምር?",
"login_reset_device_confirm_body": "ይህ በዚህ መሣሪያ ላይ የተቀመጠውን የኖድ ውሂብ ያጠፋል እና ወደ የማዋቀሪያ አዋቂው ይመለሳል። በሌላ መሣሪያ ላይ የተገናኙበት ኖድ ግን ተጽዕኖ አይደርስበትም። ይህ ድርጊት መልሰው የማይቀር ነው።",
"login_reset_device_confirm_title": "ይህን መሣሪያ ዳግም ማስጀመር?",
"login_setup_complete_relogin": "ማዋቀሩ ተጠናቅቋል። መስቀለኛዎ እንደገና ስለተጀመረ፣ እባክዎ ማዋቀሩን ለማጠናቀቅ በተጠቀሙባቸው ተመሳሳይ የመግቢያ መረጃዎች እንደገና ይግቡ።",
"login_signin_apple": "በApple ይግቡ",
"login_signin_google": "በGoogle ይግቡ",
Expand Down
2 changes: 1 addition & 1 deletion client/androidApp/src/main/assets/localization/ar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@
"login_privacy": "عرض سياسة الخصوصية",
"login_reset_device": "إعادة ضبط الجهاز",
"login_reset_device_cancel": "إلغاء",
"login_reset_device_confirm_body": "سيؤدي ذلك إلى مسح جميع البيانات المحلية والعودة إلى معالج الإعداد. لا يمكن التراجع عن هذا الإجراء.",
"login_reset_device_confirm_body": "سيؤدي ذلك إلى مسح بيانات العقدة المخزّنة على هذا الجهاز والعودة إلى معالج الإعداد. أما أي عقدة تتصل بها على جهاز آخر فلن تتأثر. لا يمكن التراجع عن هذا الإجراء.",
"login_reset_device_confirm_title": "إعادة ضبط الجهاز؟",
"login_setup_complete_relogin": "اكتمل الإعداد. أُعيد تشغيل العقدة، لذا يُرجى تسجيل الدخول مجددًا باستخدام بيانات الاعتماد نفسها التي استخدمتها لإكمال الإعداد.",
"login_signin_apple": "تسجيل الدخول باستخدام Apple",
Expand Down
2 changes: 1 addition & 1 deletion client/androidApp/src/main/assets/localization/bn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1861,7 +1861,7 @@
"login_privacy": "গোপনীয়তা নীতি দেখুন",
"login_reset_device": "ডিভাইস রিসেট করুন",
"login_reset_device_cancel": "বাতিল",
"login_reset_device_confirm_body": "এটি সমস্ত স্থানীয় ডেটা মুছে দেবে এবং সেটআপ উইজার্ডে ফিরে যাবে। এটি পূর্বাবস্থায় ফেরানো যাবে না।",
"login_reset_device_confirm_body": "এটি এই ডিভাইসে সংরক্ষিত নোডের ডেটা মুছে দেবে এবং সেটআপ উইজার্ডে ফিরে যাবে। অন্য কোনো মেশিনে আপনি যে নোডের সাথে সংযুক্ত আছেন, সেটি প্রভাবিত হবে না। এটি পূর্বাবস্থায় ফেরানো যাবে না।",
"login_reset_device_confirm_title": "ডিভাইস রিসেট করবেন?",
"login_setup_complete_relogin": "সেটআপ সম্পূর্ণ হয়েছে। আপনার নোড পুনরায় চালু হয়েছে, তাই সেটআপ সম্পূর্ণ করতে আপনি যে শংসাপত্রগুলি ব্যবহার করেছিলেন সেগুলি দিয়েই আবার লগ ইন করুন।",
"login_signin_apple": "Apple দিয়ে সাইন ইন করুন",
Expand Down
6 changes: 3 additions & 3 deletions client/androidApp/src/main/assets/localization/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1858,10 +1858,10 @@
"login_owner_hint": "Zuletzt angemeldet: {owner}",
"login_password_label": "Passwort",
"login_privacy": "Datenschutzerklärung anzeigen",
"login_reset_device": "Gerät zurücksetzen",
"login_reset_device": "Dieses Gerät zurücksetzen",
"login_reset_device_cancel": "Abbrechen",
"login_reset_device_confirm_body": "Dadurch werden alle lokalen Daten gelöscht und Sie werden zum Einrichtungsassistenten zurückgeleitet. Diese Aktion kann nicht rückgängig gemacht werden.",
"login_reset_device_confirm_title": "Gerät zurücksetzen?",
"login_reset_device_confirm_body": "Dies löscht die Knotendaten, die auf DIESEM Gerät gespeichert sind, und kehrt zum Einrichtungsassistenten zurück. Ein Knoten, mit dem Sie auf einem anderen Rechner verbunden sind, ist davon nicht betroffen. Dies kann nicht rückgängig gemacht werden.",
"login_reset_device_confirm_title": "Dieses Gerät zurücksetzen?",
"login_setup_complete_relogin": "Die Einrichtung ist abgeschlossen. Ihr Knoten wurde neu gestartet – bitte melden Sie sich erneut mit denselben Zugangsdaten an, die Sie für die Einrichtung verwendet haben.",
"login_signin_apple": "Mit Apple anmelden",
"login_signin_google": "Mit Google anmelden",
Expand Down
6 changes: 3 additions & 3 deletions client/androidApp/src/main/assets/localization/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,10 +1928,10 @@
"login_owner_hint": "Last signed in: {owner}",
"login_password_label": "Password",
"login_privacy": "View Privacy Policy",
"login_reset_device": "Reset device",
"login_reset_device": "Reset this device",
"login_reset_device_cancel": "Cancel",
"login_reset_device_confirm_body": "This will erase all local data and return to the setup wizard. This cannot be undone.",
"login_reset_device_confirm_title": "Reset device?",
"login_reset_device_confirm_body": "This erases the node data stored on THIS device and returns to the setup wizard. A node you are connected to on another machine is not affected. This cannot be undone.",
"login_reset_device_confirm_title": "Reset this device?",
"login_setup_complete_relogin": "Setup is complete. Your node restarted, so please log back in with the same credentials you used to complete setup.",
"login_signin_apple": "Sign in with Apple",
"login_signin_google": "Sign in with Google",
Expand Down
2 changes: 1 addition & 1 deletion client/androidApp/src/main/assets/localization/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@
"login_privacy": "Ver Política de Privacidad",
"login_reset_device": "Restablecer dispositivo",
"login_reset_device_cancel": "Cancelar",
"login_reset_device_confirm_body": "Esto borrará todos los datos locales y volverás al asistente de configuración. Esta acción no se puede deshacer.",
"login_reset_device_confirm_body": "Esto borrará los datos del nodo almacenados en ESTE dispositivo y volverá al asistente de configuración. Un nodo al que estés conectado en otra máquina no se verá afectado. Esta acción no se puede deshacer.",
"login_reset_device_confirm_title": "¿Restablecer dispositivo?",
"login_setup_complete_relogin": "La configuración ha finalizado. Tu nodo se reinició, así que vuelve a iniciar sesión con las mismas credenciales que usaste para completar la configuración.",
"login_signin_apple": "Iniciar sesión con Apple",
Expand Down
2 changes: 1 addition & 1 deletion client/androidApp/src/main/assets/localization/fa.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1866,7 +1866,7 @@
"login_privacy": "مشاهده سیاست حریم خصوصی",
"login_reset_device": "بازنشانی دستگاه",
"login_reset_device_cancel": "لغو",
"login_reset_device_confirm_body": "این عمل تمام داده‌های محلی را پاک می‌کند و به راه‌اندازی اولیه بازمی‌گردد. این کار قابل بازگشت نیست.",
"login_reset_device_confirm_body": "این کار داده‌های گره ذخیره‌شده روی همین دستگاه را پاک می‌کند و به دستیار راه‌اندازی بازمی‌گردد. گرهی که روی دستگاهی دیگر به آن متصل هستید تحت تأثیر قرار نمی‌گیرد. این کار قابل بازگشت نیست.",
"login_reset_device_confirm_title": "بازنشانی دستگاه؟",
"login_setup_complete_relogin": "راه‌اندازی کامل شد. نود شما دوباره راه‌اندازی شد؛ لطفاً با همان اطلاعات ورودی که برای تکمیل راه‌اندازی استفاده کردید، دوباره وارد شوید.",
"login_signin_apple": "ورود باستخدام Apple",
Expand Down
2 changes: 1 addition & 1 deletion client/androidApp/src/main/assets/localization/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@
"login_privacy": "Voir la Politique de Confidentialité",
"login_reset_device": "Réinitialiser l'appareil",
"login_reset_device_cancel": "Annuler",
"login_reset_device_confirm_body": "Cela effacera toutes les données locales et vous ramènera à l'assistant de configuration. Cette action est irréversible.",
"login_reset_device_confirm_body": "Cela efface les données du nœud stockées sur CET appareil et revient à l'assistant de configuration. Un nœud auquel vous êtes connecté sur une autre machine n'est pas affecté. Cela ne peut pas être annulé.",
"login_reset_device_confirm_title": "Réinitialiser l'appareil ?",
"login_setup_complete_relogin": "La configuration est terminée. Votre nœud a redémarré : veuillez vous reconnecter avec les mêmes identifiants que ceux utilisés pour terminer la configuration.",
"login_signin_apple": "Se connecter avec Apple",
Expand Down
2 changes: 1 addition & 1 deletion client/androidApp/src/main/assets/localization/ha.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@
"login_privacy": "Duba Sera na Asirta",
"login_reset_device": "Sake saita na'ura",
"login_reset_device_cancel": "Soke",
"login_reset_device_confirm_body": "Wannan zai share duk bayanan gida kuma ya koma zuwa jagorar saiti. Ba za a iya maido da wannan ba.",
"login_reset_device_confirm_body": "Wannan zai share bayanan kumburin da aka ajiye a WANNAN na'urar kuma ya koma zuwa jagorar saiti. Kumburin da kuke haɗe da shi a wata na'ura ba zai sami tasiri ba. Ba za a iya mayar da wannan aiki ba.",
"login_reset_device_confirm_title": "Sake saita na'ura?",
"login_setup_complete_relogin": "An kammala saitin. Node ɗinka ya sake farawa, don haka ka sake shiga da bayanan shiga guda ɗaya da ka yi amfani da su wajen kammala saitin.",
"login_signin_apple": "Shiga tare da Apple",
Expand Down
6 changes: 3 additions & 3 deletions client/androidApp/src/main/assets/localization/hi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1858,10 +1858,10 @@
"login_owner_hint": "पिछली बार साइन इन किया: {owner}",
"login_password_label": "पासवर्ड",
"login_privacy": "गोपनीयता नीति देखें",
"login_reset_device": "डिवाइस रीसेट करें",
"login_reset_device": "इस डिवाइस को रीसेट करें",
"login_reset_device_cancel": "रद्द करें",
"login_reset_device_confirm_body": "यह सभी स्थानीय डेटा मिटा देगा और सेटअप विज़ार्ड पर वापस ले जाएगा। इसे पूर्ववत नहीं किया जा सकता।",
"login_reset_device_confirm_title": "डिवाइस रीसेट करें?",
"login_reset_device_confirm_body": "यह इस डिवाइस पर संग्रहीत नोड डेटा मिटा देगा और सेटअप विज़ार्ड पर वापस ले जाएगा। किसी अन्य मशीन पर जिस नोड से आप जुड़े हैं, वह प्रभावित नहीं होगा। इसे पूर्ववत नहीं किया जा सकता।",
"login_reset_device_confirm_title": "इस डिवाइस को रीसेट करें?",
"login_setup_complete_relogin": "सेटअप पूरा हो गया है। आपका नोड फिर से चालू हुआ है, इसलिए कृपया उन्हीं क्रेडेंशियल से दोबारा लॉग इन करें जिनका उपयोग आपने सेटअप पूरा करने के लिए किया था।",
"login_signin_apple": "Apple से साइन इन करें",
"login_signin_google": "Google से साइन इन करें",
Expand Down
6 changes: 3 additions & 3 deletions client/androidApp/src/main/assets/localization/id.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1858,10 +1858,10 @@
"login_owner_hint": "Terakhir masuk: {owner}",
"login_password_label": "Kata Sandi",
"login_privacy": "Lihat Kebijakan Privasi",
"login_reset_device": "Atur ulang perangkat",
"login_reset_device": "Atur ulang perangkat ini",
"login_reset_device_cancel": "Batal",
"login_reset_device_confirm_body": "Ini akan menghapus semua data lokal dan kembali ke wizard penyiapan. Tindakan ini tidak dapat dibatalkan.",
"login_reset_device_confirm_title": "Atur ulang perangkat?",
"login_reset_device_confirm_body": "Ini akan menghapus data node yang tersimpan di perangkat INI dan kembali ke wizard penyiapan. Node tempat Anda terhubung di mesin lain tidak terpengaruh. Tindakan ini tidak dapat dibatalkan.",
"login_reset_device_confirm_title": "Atur ulang perangkat ini?",
"login_setup_complete_relogin": "Penyiapan selesai. Node Anda telah dimulai ulang, jadi silakan masuk kembali dengan kredensial yang sama seperti yang Anda gunakan saat menyelesaikan penyiapan.",
"login_signin_apple": "Masuk dengan Apple",
"login_signin_google": "Masuk dengan Google",
Expand Down
2 changes: 1 addition & 1 deletion client/androidApp/src/main/assets/localization/it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@
"login_privacy": "Visualizza Informativa sulla Privacy",
"login_reset_device": "Ripristina dispositivo",
"login_reset_device_cancel": "Annulla",
"login_reset_device_confirm_body": "Verranno cancellati tutti i dati locali e si tornerà alla procedura guidata di configurazione. Questa azione non può essere annullata.",
"login_reset_device_confirm_body": "Verranno cancellati i dati del nodo memorizzati su QUESTO dispositivo e si tornerà alla procedura guidata di configurazione. Un nodo a cui sei connesso su un'altra macchina non subisce modifiche. Questa azione non può essere annullata.",
"login_reset_device_confirm_title": "Ripristinare il dispositivo?",
"login_setup_complete_relogin": "La configurazione è completata. Il tuo nodo è stato riavviato: accedi di nuovo con le stesse credenziali che hai usato per completare la configurazione.",
"login_signin_apple": "Accedi con Apple",
Expand Down
2 changes: 1 addition & 1 deletion client/androidApp/src/main/assets/localization/ja.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@
"login_privacy": "プライバシーポリシーを表示",
"login_reset_device": "デバイスをリセット",
"login_reset_device_cancel": "キャンセル",
"login_reset_device_confirm_body": "すべてのローカルデータが消去され、セットアップウィザードに戻ります。この操作は元に戻せません。",
"login_reset_device_confirm_body": "このデバイスに保存されているノードデータが消去され、セットアップウィザードに戻ります。別のマシン上で接続しているノードには影響しません。この操作は元に戻せません。",
"login_reset_device_confirm_title": "デバイスをリセットしますか？",
"login_setup_complete_relogin": "セットアップが完了しました。ノードが再起動したため、セットアップで使用したものと同じ認証情報で再度ログインしてください。",
"login_signin_apple": "Appleでサインイン",
Expand Down
2 changes: 1 addition & 1 deletion client/androidApp/src/main/assets/localization/ko.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@
"login_privacy": "개인정보 보호정책 보기",
"login_reset_device": "기기 재설정",
"login_reset_device_cancel": "취소",
"login_reset_device_confirm_body": "모든 로컬 데이터가 삭제되고 설정 마법사로 돌아갑니다. 이 작업은 취소할 수 없습니다.",
"login_reset_device_confirm_body": "이 작업은 이 기기에 저장된 노드 데이터를 삭제하고 설정 마법사로 돌아갑니다. 다른 기기에서 연결해 사용 중인 노드는 영향을 받지 않습니다. 이 작업은 취소할 수 없습니다.",
"login_reset_device_confirm_title": "기기를 재설정하시겠습니까?",
"login_setup_complete_relogin": "설정이 완료되었습니다. 노드가 재시작되었으므로 설정에 사용한 것과 동일한 자격 증명으로 다시 로그인해 주세요.",
"login_signin_apple": "Apple로 로그인",
Expand Down
2 changes: 1 addition & 1 deletion client/androidApp/src/main/assets/localization/mr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@
"login_privacy": "गोपनीयता धोरण पाहा",
"login_reset_device": "डिव्हाइस रीसेट करा",
"login_reset_device_cancel": "रद्द करा",
"login_reset_device_confirm_body": "हे सर्व स्थानिक डेटा मिटवेल आणि सेटअप विझार्डवर परत जाईल. हे पूर्ववत केले जाऊ शकत नाही.",
"login_reset_device_confirm_body": "यामुळे याच डिव्हाइसवर साठवलेला नोड डेटा पुसला जाईल आणि सेटअप विझार्डवर परत जाईल. तुम्ही दुसऱ्या मशीनवरील ज्या नोडशी जोडलेले आहात, त्यावर याचा परिणाम होत नाही. हे पूर्ववत केले जाऊ शकत नाही.",
"login_reset_device_confirm_title": "डिव्हाइस रीसेट करायचे?",
"login_setup_complete_relogin": "सेटअप पूर्ण झाला आहे. तुमचा नोड पुन्हा सुरू झाला आहे, त्यामुळे सेटअप पूर्ण करण्यासाठी वापरलेल्या त्याच क्रेडेन्शियल्सने कृपया पुन्हा लॉग इन करा.",
"login_signin_apple": "Apple सह साइन इन करा",
Expand Down
Loading
Loading