From bca4d6898f6751d58f6babb969bbb673dd7afaf4 Mon Sep 17 00:00:00 2001 From: Mark Veidemanis Date: Sat, 7 Mar 2026 20:52:13 +0000 Subject: [PATCH] Increase security and reformat --- app/test_settings.py | 1 + app/urls.py | 10 +- core/assist/repeat_answer.py | 21 +- core/clients/__init__.py | 3 +- core/clients/signal.py | 122 +- core/clients/transport.py | 6 +- core/clients/whatsapp.py | 95 +- core/clients/xmpp.py | 616 ++++++- core/commands/delivery.py | 14 +- core/commands/engine.py | 26 +- core/commands/handlers/bp.py | 137 +- core/commands/handlers/claude.py | 183 ++- core/commands/handlers/codex.py | 192 ++- core/commands/policies.py | 11 +- core/context_processors.py | 10 +- core/db/sql.py | 1 - core/events/ledger.py | 12 +- core/events/projection.py | 59 +- core/forms.py | 1 + core/gateway/commands.py | 10 +- .../commands/backfill_contact_availability.py | 24 +- core/management/commands/codex_worker.py | 127 +- .../commands/event_projection_shadow.py | 4 +- .../recalculate_contact_availability.py | 26 +- .../reconcile_workspace_metric_history.py | 64 +- core/management/commands/task_sync_worker.py | 4 +- core/mcp/server.py | 4 +- core/mcp/tools.py | 36 +- core/memory/__init__.py | 2 +- core/memory/pipeline.py | 12 +- core/memory/retrieval.py | 20 +- core/memory/search_backend.py | 22 +- core/messaging/history.py | 11 +- core/messaging/reply_sync.py | 12 +- ...suggestionevent_chattasksource_and_more.py | 3 +- ...ontactavailability_and_externalchatlink.py | 2 +- ...odexrun_codexpermissionrequest_and_more.py | 2 +- ...35_conversationevent_adapterhealthevent.py | 2 +- ...mmandsecuritypolicy_gatewaycommandevent.py | 2 +- .../0042_userxmppomemotrustedkey_and_more.py | 39 + ...ngs_encrypt_contact_messages_with_omemo.py | 18 + core/models.py | 109 +- core/modules/router.py | 14 +- core/presence/engine.py | 19 +- core/presence/query.py | 5 +- core/security/__init__.py | 1 - core/security/attachments.py | 4 +- core/security/command_policy.py | 17 +- core/tasks/chat_defaults.py | 4 +- core/tasks/codex_approval.py | 8 +- core/tasks/codex_support.py | 4 +- core/tasks/engine.py | 156 +- core/tasks/providers/claude_cli.py | 36 +- core/tasks/providers/codex_cli.py | 26 +- core/tasks/providers/mock.py | 26 +- core/templates/base.html | 83 +- .../pages/accessibility-settings.html | 40 +- core/templates/pages/ai-execution-log.html | 542 +++---- .../pages/availability-settings.html | 124 +- .../templates/pages/business-plan-editor.html | 2 +- core/templates/pages/business-plan-inbox.html | 99 ++ core/templates/pages/codex-settings.html | 264 +-- core/templates/pages/command-routing.html | 5 +- core/templates/pages/security.html | 1409 +++++++++-------- core/templates/pages/settings-category.html | 34 +- core/templates/pages/tasks-detail.html | 246 +-- core/templates/pages/tasks-epic.html | 38 +- core/templates/pages/tasks-group.html | 202 +-- core/templates/pages/tasks-hub.html | 372 ++--- core/templates/pages/tasks-project.html | 184 +-- core/templates/pages/tasks-settings.html | 1276 +++++++-------- .../partials/ai-workspace-ai-result.html | 6 +- .../ai-workspace-mitigation-panel.html | 64 +- .../partials/ai-workspace-person-widget.html | 238 +-- core/templates/partials/compose-panel.html | 46 +- .../compose-workspace-contacts-widget.html | 78 +- .../partials/osint/search-panel.html | 16 +- core/templates/partials/queue-list.html | 6 +- .../partials/settings-hierarchy-nav.html | 6 +- .../templates/partials/signal-chats-list.html | 274 ++-- .../partials/whatsapp-account-add.html | 12 +- .../templates/two_factor/_wizard_actions.html | 6 +- .../two_factor/core/backup_tokens.html | 2 +- core/templates/two_factor/core/login.html | 4 +- .../two_factor/core/otp_required.html | 2 +- .../two_factor/core/setup_complete.html | 6 +- .../templates/two_factor/profile/disable.html | 2 +- .../templates/two_factor/profile/profile.html | 8 +- core/tests/test_ai_run_log.py | 3 +- .../test_backfill_contact_availability.py | 14 +- core/tests/test_bp_fallback.py | 4 +- core/tests/test_bp_subcommands.py | 40 +- core/tests/test_claude_cli_provider.py | 21 +- core/tests/test_claude_commands_phase1.py | 16 +- core/tests/test_codex_cli_provider.py | 21 +- core/tests/test_codex_commands_phase1.py | 39 +- core/tests/test_codex_worker_phase1.py | 30 +- core/tests/test_command_security_policy.py | 8 +- core/tests/test_command_variant_policy.py | 18 +- core/tests/test_compose_react.py | 4 +- core/tests/test_cross_platform_messaging.py | 17 +- core/tests/test_event_projection_shadow.py | 6 +- core/tests/test_mcp_tools.py | 24 +- core/tests/test_memory_pipeline_commands.py | 12 +- core/tests/test_phase1_command_reply.py | 12 +- core/tests/test_presence_engine.py | 16 +- core/tests/test_reaction_normalization.py | 15 +- ...test_reconcile_workspace_metric_history.py | 4 +- core/tests/test_signal_relink.py | 2 +- core/tests/test_signal_reply_send.py | 27 +- core/tests/test_task_engine_plan09.py | 45 +- core/tests/test_tasks_pages_management.py | 24 +- core/tests/test_tasks_settings_and_toggle.py | 115 +- core/tests/test_transport_capabilities.py | 11 +- .../test_whatsapp_reaction_and_recalc.py | 28 +- core/tests/test_xmpp_approval_commands.py | 18 +- core/tests/test_xmpp_integration.py | 182 ++- core/tests/test_xmpp_omemo_support.py | 414 ++++- core/translation/engine.py | 8 +- core/util/django_settings_export.py | 1 + core/views/ais.py | 2 +- core/views/automation.py | 113 +- core/views/availability.py | 10 +- core/views/compose.py | 162 +- core/views/groups.py | 2 +- core/views/identifiers.py | 2 +- core/views/manipulations.py | 2 +- core/views/messages.py | 2 +- core/views/notifications.py | 2 +- core/views/osint.py | 89 +- core/views/people.py | 2 +- core/views/personas.py | 2 +- core/views/queues.py | 4 +- core/views/sessions.py | 2 +- core/views/signal.py | 16 +- core/views/system.py | 368 ++++- core/views/tasks.py | 483 ++++-- core/views/whatsapp.py | 12 +- core/views/workspace.py | 28 +- core/workspace/sampling.py | 14 +- docker/watch_and_restart.py | 1 + docker/watch_simple.py | 1 + manage.py | 1 + scripts/quadlet/render_units.py | 85 +- 144 files changed, 6735 insertions(+), 3960 deletions(-) create mode 100644 core/migrations/0042_userxmppomemotrustedkey_and_more.py create mode 100644 core/migrations/0043_userxmppsecuritysettings_encrypt_contact_messages_with_omemo.py create mode 100644 core/templates/pages/business-plan-inbox.html diff --git a/app/test_settings.py b/app/test_settings.py index 6401bfa..191fd80 100644 --- a/app/test_settings.py +++ b/app/test_settings.py @@ -1,4 +1,5 @@ """Test-only settings overrides — used via DJANGO_SETTINGS_MODULE=app.test_settings.""" + from app.settings import * # noqa: F401, F403 CACHES = { diff --git a/app/urls.py b/app/urls.py index 452f8f1..f770299 100644 --- a/app/urls.py +++ b/app/urls.py @@ -13,12 +13,13 @@ Including another URLconf 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.conf import settings from django.conf.urls.static import static from django.contrib import admin from django.contrib.auth.views import LogoutView -from django.views.generic import RedirectView from django.urls import include, path +from django.views.generic import RedirectView from two_factor.urls import urlpatterns as tf_urls from two_factor.views.profile import ProfileView @@ -41,8 +42,8 @@ from core.views import ( queues, sessions, signal, - tasks, system, + tasks, whatsapp, workspace, ) @@ -188,6 +189,11 @@ urlpatterns = [ automation.TranslationSettings.as_view(), name="translation_settings", ), + path( + "settings/business-plans/", + automation.BusinessPlanInbox.as_view(), + name="business_plan_inbox", + ), path( "settings/business-plan//", automation.BusinessPlanEditor.as_view(), diff --git a/core/assist/repeat_answer.py b/core/assist/repeat_answer.py index 70a3ebd..ffef7a1 100644 --- a/core/assist/repeat_answer.py +++ b/core/assist/repeat_answer.py @@ -38,14 +38,31 @@ def _is_question(text: str) -> bool: if not body: return False low = body.lower() - return body.endswith("?") or low.startswith(("what", "why", "how", "when", "where", "who", "can ", "do ", "did ", "is ", "are ")) + return body.endswith("?") or low.startswith( + ( + "what", + "why", + "how", + "when", + "where", + "who", + "can ", + "do ", + "did ", + "is ", + "are ", + ) + ) def _is_group_channel(message: Message) -> bool: channel = str(getattr(message, "source_chat_id", "") or "").strip().lower() if channel.endswith("@g.us"): return True - return str(getattr(message, "source_service", "") or "").strip().lower() == "xmpp" and "conference." in channel + return ( + str(getattr(message, "source_service", "") or "").strip().lower() == "xmpp" + and "conference." in channel + ) async def learn_from_message(message: Message) -> None: diff --git a/core/clients/__init__.py b/core/clients/__init__.py index d04b9f5..06c27f9 100644 --- a/core/clients/__init__.py +++ b/core/clients/__init__.py @@ -12,8 +12,7 @@ class ClientBase(ABC): self.log.info(f"{self.service.capitalize()} client initialising...") @abstractmethod - def start(self): - ... + def start(self): ... # @abstractmethod # async def send_message(self, recipient, message): diff --git a/core/clients/signal.py b/core/clients/signal.py index d1361db..71c0746 100644 --- a/core/clients/signal.py +++ b/core/clients/signal.py @@ -12,7 +12,15 @@ from django.urls import reverse from signalbot import Command, Context, SignalBot from core.clients import ClientBase, signalapi, transport -from core.messaging import ai, history, media_bridge, natural, replies, reply_sync, utils +from core.messaging import ( + ai, + history, + media_bridge, + natural, + replies, + reply_sync, + utils, +) from core.models import ( Chat, Manipulation, @@ -402,7 +410,9 @@ class NewSignalBot(SignalBot): seen_user_ids.add(pi.user_id) users.append(pi.user) if not users: - self.log.debug("[Signal] _upsert_groups: no PersonIdentifiers found — skipping") + self.log.debug( + "[Signal] _upsert_groups: no PersonIdentifiers found — skipping" + ) return for user in users: @@ -423,7 +433,9 @@ class NewSignalBot(SignalBot): }, ) - self.log.info("[Signal] upserted %d groups for %d users", len(groups), len(users)) + self.log.info( + "[Signal] upserted %d groups for %d users", len(groups), len(users) + ) async def _detect_groups(self): await super()._detect_groups() @@ -505,7 +517,9 @@ class HandleMessage(Command): source_uuid_norm and dest_norm and source_uuid_norm == dest_norm ) - is_from_bot = bool(bot_uuid and source_uuid_norm and source_uuid_norm == bot_uuid) + is_from_bot = bool( + bot_uuid and source_uuid_norm and source_uuid_norm == bot_uuid + ) if (not is_from_bot) and bot_phone_digits and source_phone_digits: is_from_bot = source_phone_digits == bot_phone_digits # Inbound deliveries usually do not have destination fields populated. @@ -596,9 +610,9 @@ class HandleMessage(Command): candidate_digits = {value for value in candidate_digits if value} if candidate_digits: signal_rows = await sync_to_async(list)( - PersonIdentifier.objects.filter(service=self.service).select_related( - "user" - ) + PersonIdentifier.objects.filter( + service=self.service + ).select_related("user") ) matched = [] for row in signal_rows: @@ -718,13 +732,13 @@ class HandleMessage(Command): target_ts=int(reaction_payload.get("target_ts") or 0), emoji=str(reaction_payload.get("emoji") or ""), source_service="signal", - actor=( - effective_source_uuid or effective_source_number or "" - ), + actor=(effective_source_uuid or effective_source_number or ""), target_author=str( (reaction_payload.get("raw") or {}).get("targetAuthorUuid") or (reaction_payload.get("raw") or {}).get("targetAuthor") - or (reaction_payload.get("raw") or {}).get("targetAuthorNumber") + or (reaction_payload.get("raw") or {}).get( + "targetAuthorNumber" + ) or "" ), remove=bool(reaction_payload.get("remove")), @@ -741,9 +755,7 @@ class HandleMessage(Command): remove=bool(reaction_payload.get("remove")), upstream_message_id="", upstream_ts=int(reaction_payload.get("target_ts") or 0), - actor=( - effective_source_uuid or effective_source_number or "" - ), + actor=(effective_source_uuid or effective_source_number or ""), payload=reaction_payload.get("raw") or {}, ) except Exception as exc: @@ -840,9 +852,7 @@ class HandleMessage(Command): source_ref={ "upstream_message_id": "", "upstream_author": str( - effective_source_uuid - or effective_source_number - or "" + effective_source_uuid or effective_source_number or "" ), "upstream_ts": int(ts or 0), }, @@ -1134,7 +1144,9 @@ class SignalClient(ClientBase): if int(message_row.delivered_ts or 0) <= 0: message_row.delivered_ts = int(result) update_fields.append("delivered_ts") - if str(message_row.source_message_id or "").strip() != str(result): + if str(message_row.source_message_id or "").strip() != str( + result + ): message_row.source_message_id = str(result) update_fields.append("source_message_id") if update_fields: @@ -1146,9 +1158,11 @@ class SignalClient(ClientBase): command_id, { "ok": True, - "timestamp": int(result) - if isinstance(result, int) - else int(time.time() * 1000), + "timestamp": ( + int(result) + if isinstance(result, int) + else int(time.time() * 1000) + ), }, ) except Exception as exc: @@ -1248,7 +1262,9 @@ class SignalClient(ClientBase): if _digits_only(getattr(row, "identifier", "")) in candidate_digits ] - async def _auto_link_single_user_signal_identifier(self, source_uuid: str, source_number: str): + async def _auto_link_single_user_signal_identifier( + self, source_uuid: str, source_number: str + ): owner_rows = await sync_to_async(list)( PersonIdentifier.objects.filter(service=self.service) .select_related("user") @@ -1292,7 +1308,9 @@ class SignalClient(ClientBase): payload = json.loads(raw_message or "{}") except Exception: return - exception_payload = payload.get("exception") if isinstance(payload, dict) else None + exception_payload = ( + payload.get("exception") if isinstance(payload, dict) else None + ) if isinstance(exception_payload, dict): err_type = str(exception_payload.get("type") or "").strip() err_msg = str(exception_payload.get("message") or "").strip() @@ -1322,7 +1340,9 @@ class SignalClient(ClientBase): (envelope.get("timestamp") if isinstance(envelope, dict) else 0) or int(time.time() * 1000) ), - last_inbound_exception_account=str(payload.get("account") or "").strip(), + last_inbound_exception_account=str( + payload.get("account") or "" + ).strip(), last_inbound_exception_source_uuid=envelope_source_uuid, last_inbound_exception_source_number=envelope_source_number, last_inbound_exception_envelope_ts=envelope_ts, @@ -1346,7 +1366,11 @@ class SignalClient(ClientBase): raw_text = sync_sent_message.get("message") if isinstance(raw_text, dict): text = _extract_signal_text( - {"envelope": {"syncMessage": {"sentMessage": {"message": raw_text}}}}, + { + "envelope": { + "syncMessage": {"sentMessage": {"message": raw_text}} + } + }, str( raw_text.get("message") or raw_text.get("text") @@ -1396,9 +1420,15 @@ class SignalClient(ClientBase): source_service="signal", actor=(source_uuid or source_number or ""), target_author=str( - (reaction_payload.get("raw") or {}).get("targetAuthorUuid") - or (reaction_payload.get("raw") or {}).get("targetAuthor") - or (reaction_payload.get("raw") or {}).get("targetAuthorNumber") + (reaction_payload.get("raw") or {}).get( + "targetAuthorUuid" + ) + or (reaction_payload.get("raw") or {}).get( + "targetAuthor" + ) + or (reaction_payload.get("raw") or {}).get( + "targetAuthorNumber" + ) or "" ), remove=bool(reaction_payload.get("remove")), @@ -1505,7 +1535,9 @@ class SignalClient(ClientBase): source_chat_id = destination_number or destination_uuid or sender_key reply_ref = reply_sync.extract_reply_ref(self.service, payload) for identifier in identifiers: - session = await history.get_chat_session(identifier.user, identifier) + session = await history.get_chat_session( + identifier.user, identifier + ) reply_target = await reply_sync.resolve_reply_target( identifier.user, session, @@ -1552,13 +1584,19 @@ class SignalClient(ClientBase): if not isinstance(data_message, dict): return - source_uuid = str(envelope.get("sourceUuid") or envelope.get("source") or "").strip() + source_uuid = str( + envelope.get("sourceUuid") or envelope.get("source") or "" + ).strip() source_number = str(envelope.get("sourceNumber") or "").strip() bot_uuid = str(getattr(self.client, "bot_uuid", "") or "").strip() bot_phone = str(getattr(self.client, "phone_number", "") or "").strip() if source_uuid and bot_uuid and source_uuid == bot_uuid: return - if source_number and bot_phone and _digits_only(source_number) == _digits_only(bot_phone): + if ( + source_number + and bot_phone + and _digits_only(source_number) == _digits_only(bot_phone) + ): return identifiers = await self._resolve_signal_identifiers(source_uuid, source_number) @@ -1610,14 +1648,18 @@ class SignalClient(ClientBase): target_author=str( (reaction_payload.get("raw") or {}).get("targetAuthorUuid") or (reaction_payload.get("raw") or {}).get("targetAuthor") - or (reaction_payload.get("raw") or {}).get("targetAuthorNumber") + or (reaction_payload.get("raw") or {}).get( + "targetAuthorNumber" + ) or "" ), remove=bool(reaction_payload.get("remove")), payload=reaction_payload.get("raw") or {}, ) except Exception as exc: - self.log.warning("signal raw reaction history apply failed: %s", exc) + self.log.warning( + "signal raw reaction history apply failed: %s", exc + ) try: await self.ur.xmpp.client.apply_external_reaction( identifier.user, @@ -1631,7 +1673,9 @@ class SignalClient(ClientBase): payload=reaction_payload.get("raw") or {}, ) except Exception as exc: - self.log.warning("signal raw reaction relay to XMPP failed: %s", exc) + self.log.warning( + "signal raw reaction relay to XMPP failed: %s", exc + ) transport.update_runtime_state( self.service, last_inbound_ok_ts=int(time.time() * 1000), @@ -1683,7 +1727,9 @@ class SignalClient(ClientBase): ) return - text = _extract_signal_text(payload, str(data_message.get("message") or "").strip()) + text = _extract_signal_text( + payload, str(data_message.get("message") or "").strip() + ) if not text: return @@ -1702,7 +1748,11 @@ class SignalClient(ClientBase): or envelope.get("timestamp") or ts ).strip() - sender_key = source_uuid or source_number or (identifiers[0].identifier if identifiers else "") + sender_key = ( + source_uuid + or source_number + or (identifiers[0].identifier if identifiers else "") + ) source_chat_id = source_number or source_uuid or sender_key reply_ref = reply_sync.extract_reply_ref(self.service, payload) diff --git a/core/clients/transport.py b/core/clients/transport.py index 6eb4e6d..f9a8212 100644 --- a/core/clients/transport.py +++ b/core/clients/transport.py @@ -927,7 +927,11 @@ async def send_reaction( service_key = _service_key(service) if _capability_checks_enabled() and not supports(service_key, "reactions"): reason = unsupported_reason(service_key, "reactions") - log.warning("capability-check failed service=%s feature=reactions: %s", service_key, reason) + log.warning( + "capability-check failed service=%s feature=reactions: %s", + service_key, + reason, + ) return False if not str(emoji or "").strip() and not remove: return False diff --git a/core/clients/whatsapp.py b/core/clients/whatsapp.py index c4287cb..be80b95 100644 --- a/core/clients/whatsapp.py +++ b/core/clients/whatsapp.py @@ -173,9 +173,7 @@ class WhatsAppClient(ClientBase): if db_dir: os.makedirs(db_dir, exist_ok=True) if db_dir and not os.access(db_dir, os.W_OK): - raise PermissionError( - f"session db directory is not writable: {db_dir}" - ) + raise PermissionError(f"session db directory is not writable: {db_dir}") except Exception as exc: self._publish_state( connected=False, @@ -772,9 +770,11 @@ class WhatsAppClient(ClientBase): command_id, { "ok": True, - "timestamp": int(result) - if isinstance(result, int) - else int(time.time() * 1000), + "timestamp": ( + int(result) + if isinstance(result, int) + else int(time.time() * 1000) + ), }, ) self.log.debug( @@ -1910,9 +1910,7 @@ class WhatsAppClient(ClientBase): jid_value = self._jid_to_identifier( self._pluck(group, "JID") or self._pluck(group, "jid") ) - identifier = ( - jid_value.split("@", 1)[0].strip() if jid_value else "" - ) + identifier = jid_value.split("@", 1)[0].strip() if jid_value else "" if not identifier: continue name = ( @@ -2362,12 +2360,22 @@ class WhatsAppClient(ClientBase): node = ( self._pluck(message_obj, "reactionMessage") or self._pluck(message_obj, "reaction_message") - or self._pluck(message_obj, "ephemeralMessage", "message", "reactionMessage") - or self._pluck(message_obj, "ephemeral_message", "message", "reaction_message") + or self._pluck( + message_obj, "ephemeralMessage", "message", "reactionMessage" + ) + or self._pluck( + message_obj, "ephemeral_message", "message", "reaction_message" + ) or self._pluck(message_obj, "viewOnceMessage", "message", "reactionMessage") - or self._pluck(message_obj, "view_once_message", "message", "reaction_message") - or self._pluck(message_obj, "viewOnceMessageV2", "message", "reactionMessage") - or self._pluck(message_obj, "view_once_message_v2", "message", "reaction_message") + or self._pluck( + message_obj, "view_once_message", "message", "reaction_message" + ) + or self._pluck( + message_obj, "viewOnceMessageV2", "message", "reactionMessage" + ) + or self._pluck( + message_obj, "view_once_message_v2", "message", "reaction_message" + ) or self._pluck( message_obj, "viewOnceMessageV2Extension", @@ -2410,7 +2418,9 @@ class WhatsAppClient(ClientBase): explicit_remove = self._pluck(node, "remove") or self._pluck(node, "isRemove") if explicit_remove is None: explicit_remove = self._pluck(node, "is_remove") - remove = bool(explicit_remove) if explicit_remove is not None else bool(not emoji) + remove = ( + bool(explicit_remove) if explicit_remove is not None else bool(not emoji) + ) if not target_msg_id: return None return { @@ -2418,7 +2428,11 @@ class WhatsAppClient(ClientBase): "target_message_id": target_msg_id, "remove": remove, "target_ts": int(target_ts or 0), - "raw": self._proto_to_dict(node) or dict(node or {}) if isinstance(node, dict) else {}, + "raw": ( + self._proto_to_dict(node) or dict(node or {}) + if isinstance(node, dict) + else {} + ), } async def _download_event_media(self, event): @@ -2760,7 +2774,9 @@ class WhatsAppClient(ClientBase): or self._pluck(msg_obj, "MessageContextInfo") or {}, "message": { - "extendedTextMessage": self._pluck(msg_obj, "extendedTextMessage") + "extendedTextMessage": self._pluck( + msg_obj, "extendedTextMessage" + ) or self._pluck(msg_obj, "ExtendedTextMessage") or {}, "imageMessage": self._pluck(msg_obj, "imageMessage") or {}, @@ -2768,9 +2784,9 @@ class WhatsAppClient(ClientBase): "videoMessage": self._pluck(msg_obj, "videoMessage") or {}, "VideoMessage": self._pluck(msg_obj, "VideoMessage") or {}, "documentMessage": self._pluck(msg_obj, "documentMessage") - or {}, + or {}, "DocumentMessage": self._pluck(msg_obj, "DocumentMessage") - or {}, + or {}, "ephemeralMessage": self._pluck(msg_obj, "ephemeralMessage") or {}, "EphemeralMessage": self._pluck(msg_obj, "EphemeralMessage") @@ -2814,7 +2830,9 @@ class WhatsAppClient(ClientBase): or {}, "viewOnceMessage": self._pluck(msg_obj, "viewOnceMessage") or {}, - "viewOnceMessageV2": self._pluck(msg_obj, "viewOnceMessageV2") + "viewOnceMessageV2": self._pluck( + msg_obj, "viewOnceMessageV2" + ) or {}, "viewOnceMessageV2Extension": self._pluck( msg_obj, "viewOnceMessageV2Extension" @@ -2840,12 +2858,12 @@ class WhatsAppClient(ClientBase): reply_sync.extract_origin_tag(payload), ) if self._chat_matches_reply_debug(chat): - info_obj = self._proto_to_dict(self._pluck(event_obj, "Info")) or self._pluck( - event_obj, "Info" - ) - raw_obj = self._proto_to_dict(self._pluck(event_obj, "Raw")) or self._pluck( - event_obj, "Raw" - ) + info_obj = self._proto_to_dict( + self._pluck(event_obj, "Info") + ) or self._pluck(event_obj, "Info") + raw_obj = self._proto_to_dict( + self._pluck(event_obj, "Raw") + ) or self._pluck(event_obj, "Raw") message_meta["wa_reply_debug"] = { "reply_ref": reply_ref, "reply_target_id": str(getattr(reply_target, "id", "") or ""), @@ -3087,9 +3105,11 @@ class WhatsAppClient(ClientBase): ) matched = False for candidate in candidates: - candidate_local = str(self._jid_to_identifier(candidate) or "").split( - "@", 1 - )[0].strip() + candidate_local = ( + str(self._jid_to_identifier(candidate) or "") + .split("@", 1)[0] + .strip() + ) if candidate_local and candidate_local == local: matched = True break @@ -3124,7 +3144,12 @@ class WhatsAppClient(ClientBase): # WhatsApp group ids are numeric and usually very long (commonly start # with 120...). Treat those as groups when no explicit mapping exists. digits = re.sub(r"[^0-9]", "", local) - if digits and digits == local and len(digits) >= 15 and digits.startswith("120"): + if ( + digits + and digits == local + and len(digits) >= 15 + and digits.startswith("120") + ): return f"{digits}@g.us" return "" @@ -3264,7 +3289,9 @@ class WhatsAppClient(ClientBase): person_identifier = await sync_to_async( lambda: ( Message.objects.filter(id=legacy_message_id) - .select_related("session__identifier__user", "session__identifier__person") + .select_related( + "session__identifier__user", "session__identifier__person" + ) .first() ) )() @@ -3274,7 +3301,9 @@ class WhatsAppClient(ClientBase): ) if ( person_identifier is not None - and str(getattr(person_identifier, "service", "") or "").strip().lower() + and str(getattr(person_identifier, "service", "") or "") + .strip() + .lower() != "whatsapp" ): person_identifier = None @@ -3418,6 +3447,8 @@ class WhatsAppClient(ClientBase): from neonize.proto.waE2E.WAWebProtobufsE2E_pb2 import ( ContextInfo, ExtendedTextMessage, + ) + from neonize.proto.waE2E.WAWebProtobufsE2E_pb2 import ( Message as WAProtoMessage, ) diff --git a/core/clients/xmpp.py b/core/clients/xmpp.py index 9a87176..3d6cbd0 100644 --- a/core/clients/xmpp.py +++ b/core/clients/xmpp.py @@ -1,7 +1,7 @@ import asyncio import base64 import json -import mimetypes +import logging import os import re import time @@ -17,6 +17,8 @@ from slixmpp.componentxmpp import ComponentXMPP from slixmpp.plugins.xep_0085.stanza import Active, Composing, Gone, Inactive, Paused from slixmpp.stanza import Message from slixmpp.xmlstream import register_stanza_plugin +from slixmpp.xmlstream.handler import Callback +from slixmpp.xmlstream.matcher import StanzaPath from slixmpp.xmlstream.stanzabase import ET from core.clients import ClientBase, transport @@ -55,6 +57,9 @@ EMOJI_ONLY_PATTERN = re.compile( r"^[\U0001F300-\U0001FAFF\u2600-\u27BF\uFE0F\u200D\u2640-\u2642\u2764]+$" ) TOTP_BASE32_SECRET_RE = re.compile(r"^[A-Z2-7]{16,}$") +PUBSUB_NS = "http://jabber.org/protocol/pubsub" +OMEMO_OLD_NS = "eu.siacs.conversations.axolotl" +OMEMO_OLD_DEVICELIST_NODE = "eu.siacs.conversations.axolotl.devicelist" def _clean_url(value): @@ -147,6 +152,7 @@ def _parse_greentext_reaction(body_text): def _omemo_plugin_available() -> bool: try: import importlib + return importlib.util.find_spec("slixmpp_omemo") is not None except Exception: return False @@ -166,15 +172,30 @@ def _extract_sender_omemo_client_key(stanza) -> dict: return {"status": "no_omemo"} +def _format_omemo_identity_fingerprint(identity_key) -> str: + if isinstance(identity_key, (bytes, bytearray)): + key_bytes = bytes(identity_key) + else: + return "" + try: + from omemo.session_manager import SessionManager as _OmemoSessionManager + + return " ".join(_OmemoSessionManager.format_identity_key(key_bytes)).upper() + except Exception: + return ":".join(f"{b:02X}" for b in key_bytes) + + # --------------------------------------------------------------------------- # OMEMO storage + plugin implementation # --------------------------------------------------------------------------- try: - from omemo.storage import Just, Maybe, Nothing, Storage as _OmemoStorageBase + from omemo.storage import Just, Maybe, Nothing + from omemo.storage import Storage as _OmemoStorageBase + from slixmpp.plugins.base import register_plugin as _slixmpp_register_plugin from slixmpp_omemo import XEP_0384 as _XEP_0384Base from slixmpp_omemo.base_session_manager import TrustLevel as _OmemoTrustLevel - from slixmpp.plugins.base import register_plugin as _slixmpp_register_plugin + _OMEMO_AVAILABLE = True except ImportError: _OMEMO_AVAILABLE = False @@ -185,6 +206,7 @@ except ImportError: if _OMEMO_AVAILABLE: + class _OmemoStorage(_OmemoStorageBase): """JSON-file-backed OMEMO key storage.""" @@ -224,7 +246,14 @@ if _OMEMO_AVAILABLE: name = "xep_0384" description = "OMEMO Encryption (GIA gateway)" - dependencies = {"xep_0004", "xep_0030", "xep_0060", "xep_0163", "xep_0280", "xep_0334"} + dependencies = { + "xep_0004", + "xep_0030", + "xep_0060", + "xep_0163", + "xep_0280", + "xep_0334", + } default_config = { "fallback_message": "This message is OMEMO encrypted.", "data_dir": "", @@ -248,6 +277,7 @@ if _OMEMO_AVAILABLE: async def _devices_blindly_trusted(self, blindly_trusted, identifier): import logging + logging.getLogger(__name__).info( "OMEMO: blindly trusted %d new device(s)", len(blindly_trusted) ) @@ -255,6 +285,7 @@ if _OMEMO_AVAILABLE: async def _prompt_manual_trust(self, manually_trusted, identifier): """Auto-trust all undecided devices (gateway mode).""" import logging + log = logging.getLogger(__name__) log.info( "OMEMO: auto-trusting %d undecided device(s) (gateway mode)", @@ -270,11 +301,12 @@ if _OMEMO_AVAILABLE: _OmemoTrustLevel.BLINDLY_TRUSTED.value, ) except Exception as exc: - log.warning("OMEMO set_trust failed for %s: %s", device.bare_jid, exc) + log.warning( + "OMEMO set_trust failed for %s: %s", device.bare_jid, exc + ) class XMPPComponent(ComponentXMPP): - """ A simple Slixmpp component that echoes messages. """ @@ -289,6 +321,7 @@ class XMPPComponent(ComponentXMPP): self._session_live = False self.log = logs.get_logger("XMPP") + logging.getLogger("slixmpp_omemo").setLevel(logging.DEBUG) super().__init__(jid, secret, server, port) # Enable message IDs so the OMEMO plugin can associate encrypted stanzas. @@ -305,6 +338,20 @@ class XMPPComponent(ComponentXMPP): self.add_event_handler("session_start", self.session_start) self.add_event_handler("disconnected", self.on_disconnected) self.add_event_handler("message", self.message) + self.register_handler( + Callback( + "OMEMOPubSubItemsGet", + StanzaPath("iq/pubsub/items"), + self._handle_pubsub_iq_get, + ) + ) + self.register_handler( + Callback( + "OMEMOPubSubPublishSet", + StanzaPath("iq/pubsub/publish"), + self._handle_pubsub_iq_set, + ) + ) # Presence event handlers self.add_event_handler("presence_available", self.on_presence_available) @@ -327,6 +374,137 @@ class XMPPComponent(ComponentXMPP): self.add_event_handler("chatstate_paused", self.on_chatstate_paused) self.add_event_handler("chatstate_inactive", self.on_chatstate_inactive) self.add_event_handler("chatstate_gone", self.on_chatstate_gone) + self._omemo_component_pubsub = self._seed_component_omemo_pubsub() + + @staticmethod + def _clone_xml(node): + return ET.fromstring(ET.tostring(node, encoding="unicode")) + + def _seed_component_omemo_pubsub(self): + return {} + + def _sync_component_omemo_pubsub(self, device_id, identity_key): + device_id = str(device_id or "").strip() + if not device_id: + return + if isinstance(identity_key, (bytes, bytearray)): + key_bytes = bytes(identity_key) + else: + key_bytes = str(identity_key or "").encode() + identity_b64 = base64.b64encode(key_bytes).decode() + + devicelist = ET.Element(f"{{{OMEMO_OLD_NS}}}list") + dev = ET.SubElement(devicelist, f"{{{OMEMO_OLD_NS}}}device") + dev.set("id", device_id) + + bundle = ET.Element(f"{{{OMEMO_OLD_NS}}}bundle") + ik = ET.SubElement(bundle, f"{{{OMEMO_OLD_NS}}}identityKey") + ik.text = identity_b64 + + self._omemo_component_pubsub = { + OMEMO_OLD_DEVICELIST_NODE: { + "item_id": "current", + "payload": devicelist, + }, + f"eu.siacs.conversations.axolotl.bundles:{device_id}": { + "item_id": "current", + "payload": bundle, + }, + } + + async def _reply_pubsub_items(self, iq, node_name): + reply = iq.reply() + pubsub = ET.Element(f"{{{PUBSUB_NS}}}pubsub") + items = ET.SubElement(pubsub, f"{{{PUBSUB_NS}}}items") + items.set("node", node_name) + stored = self._omemo_component_pubsub.get(node_name) + if stored is None and node_name.startswith( + "eu.siacs.conversations.axolotl.bundles:" + ): + bundle_nodes = [ + key + for key in self._omemo_component_pubsub + if key.startswith("eu.siacs.conversations.axolotl.bundles:") + ] + if len(bundle_nodes) == 1: + stored = self._omemo_component_pubsub.get(bundle_nodes[0]) + if stored: + item = ET.SubElement(items, f"{{{PUBSUB_NS}}}item") + item.set("id", str(stored.get("item_id") or "current")) + payload = stored.get("payload") + if payload is not None: + item.append(self._clone_xml(payload)) + reply.append(pubsub) + await reply.send() + + async def on_iq_get(self, iq): + try: + iq_to = str(iq["to"] or "").split("/", 1)[0].strip().lower() + except Exception: + iq_to = "" + own_jid = str(getattr(self.boundjid, "bare", "") or "").strip().lower() + if iq_to and own_jid and iq_to != own_jid: + return + items = iq.xml.find(f".//{{{PUBSUB_NS}}}items") + if items is None: + return + node_name = str(items.attrib.get("node") or "").strip() + if not node_name: + return + self.log.debug( + "OMEMO IQ-GET pubsub items node=%s from=%s to=%s", + node_name, + iq.get("from"), + iq.get("to"), + ) + if ( + node_name.startswith("eu.siacs.conversations.axolotl.bundles:") + or node_name == OMEMO_OLD_DEVICELIST_NODE + or node_name == "urn:xmpp:omemo:2:devices" + or node_name == "urn:xmpp:omemo:2:bundles" + ): + await self._reply_pubsub_items(iq, node_name) + + async def on_iq_set(self, iq): + try: + iq_to = str(iq["to"] or "").split("/", 1)[0].strip().lower() + except Exception: + iq_to = "" + own_jid = str(getattr(self.boundjid, "bare", "") or "").strip().lower() + if iq_to and own_jid and iq_to != own_jid: + return + publish = iq.xml.find(f".//{{{PUBSUB_NS}}}publish") + if publish is None: + return + node_name = str(publish.attrib.get("node") or "").strip() + if not node_name: + return + self.log.debug( + "OMEMO IQ-SET pubsub publish node=%s from=%s to=%s", + node_name, + iq.get("from"), + iq.get("to"), + ) + item = publish.find(f"{{{PUBSUB_NS}}}item") + payload = None + item_id = "current" + if item is not None: + item_id = str(item.attrib.get("id") or "current") + for child in list(item): + payload = child + break + if payload is not None: + self._omemo_component_pubsub[node_name] = { + "item_id": item_id, + "payload": self._clone_xml(payload), + } + await iq.reply().send() + + def _handle_pubsub_iq_get(self, iq): + asyncio.create_task(self.on_iq_get(iq)) + + def _handle_pubsub_iq_set(self, iq): + asyncio.create_task(self.on_iq_set(iq)) def _user_xmpp_domain(self): domain = str(getattr(settings, "XMPP_USER_DOMAIN", "") or "").strip() @@ -354,8 +532,6 @@ class XMPPComponent(ComponentXMPP): self.log.error(f"Failed to enable Carbons: {e}") def get_identifier(self, msg): - xmpp_message_id = str(msg.get("id") or "").strip() - # Extract sender JID (full format: user@domain/resource) sender_jid = str(msg["from"]) @@ -445,6 +621,7 @@ class XMPPComponent(ComponentXMPP): def _derived_omemo_fingerprint(self, jid: str) -> str: import hashlib + return hashlib.sha256(f"xmpp-omemo-key:{jid}".encode()).hexdigest()[:32] def _get_omemo_plugin(self): @@ -456,26 +633,198 @@ class XMPPComponent(ComponentXMPP): async def _bootstrap_omemo_for_authentic_channel(self): jid = str(getattr(settings, "XMPP_JID", "") or "").strip() + omemo_plugin = self._get_omemo_plugin() omemo_enabled = omemo_plugin is not None status = "active" if omemo_enabled else "not_available" - reason = "OMEMO plugin active" if omemo_enabled else "xep_0384 plugin not loaded" + reason = ( + "OMEMO plugin active" if omemo_enabled else "xep_0384 plugin not loaded" + ) fingerprint = self._derived_omemo_fingerprint(jid) if omemo_enabled: try: import asyncio as _asyncio + + # OMEMO session-manager bootstrap can take longer in component mode because + # it performs consistency checks and initial pubsub interactions before + # device publication is complete. session_manager = await _asyncio.wait_for( - omemo_plugin.get_session_manager(), timeout=15.0 + omemo_plugin.get_session_manager(), timeout=180.0 ) own_devices = await session_manager.get_own_device_information() + device_id = None + if own_devices: - key_bytes = own_devices[0].identity_key - fingerprint = ":".join(f"{b:02X}" for b in key_bytes) + # own_devices is a tuple: (own_device, other_devices) + own_device = ( + own_devices[0] + if isinstance(own_devices, (tuple, list)) + else own_devices + ) + key_bytes = own_device.identity_key + try: + from omemo.session_manager import ( + SessionManager as _OmemoSessionManager, + ) + + fingerprint = " ".join( + _OmemoSessionManager.format_identity_key(key_bytes) + ).upper() + except Exception: + fingerprint = ":".join(f"{b:02X}" for b in key_bytes) + device_id = own_device.device_id + self._sync_component_omemo_pubsub(device_id, key_bytes) + self.log.info( + "OMEMO: own device created, device_id=%s fingerprint=%s", + device_id, + fingerprint, + ) + else: + # Fallback: session manager may not auto-create devices for component JIDs + # Manually generate a device ID and use it + import random + + device_id = random.randint(1, 2**31 - 1) + self.log.warning( + "OMEMO: session manager did not create device (component JID limitation), " + "using fallback device_id=%s", + device_id, + ) + + # CRITICAL FIX: Publish BOTH device list AND device bundle + # Clients need both: + # 1. Device list node: eu.siacs.conversations.axolotl/devices/{jid} (lists device IDs) + # 2. Device bundle nodes: eu.siacs.conversations.axolotl/bundles:{device_id} (contains keys) + # Without bundles, clients can't encrypt (they hang in "pending...") + if device_id: + try: + namespace = "eu.siacs.conversations.axolotl" + pubsub_service = ( + str(getattr(settings, "XMPP_PUBSUB_SERVICE", "pubsub")) + or "pubsub" + ) + + # Step 1: Publish device list + try: + device_list_dict = {device_id: None} + await session_manager._upload_device_list( + namespace, device_list_dict + ) + self.log.info( + "OMEMO: device list uploaded via session manager for %s", + jid, + ) + except (AttributeError, TypeError): + # Fallback: Manual publish via XEP-0060 + try: + device_item = ET.Element("list") + device_item.set("xmlns", namespace) + for dev_id in device_list_dict: + device_elem = ET.SubElement(device_item, "device") + device_elem.set("id", str(dev_id)) + + node_name = f"{namespace}/devices/{jid}" + await self["xep_0060"].publish( + pubsub_service, node_name, payload=device_item + ) + self.log.info( + "OMEMO: device list published via XEP-0060 for %s", + jid, + ) + except Exception as e: + self.log.warning( + "OMEMO: device list publish failed: %s", e + ) + + # Step 2: Publish device bundle (CRITICAL - contains the keys!) + # This is what was missing - clients couldn't find the keys + try: + if own_devices: + # Get actual identity key from device + own_device = ( + own_devices[0] + if isinstance(own_devices, (tuple, list)) + else own_devices + ) + identity_key = own_device.identity_key + signed_prekey = getattr( + own_device, "signed_prekey", None + ) + + # Build bundle item with actual keys + bundle_item = ET.Element("bundle") + bundle_item.set("xmlns", namespace) + + # Add signed prekey + if signed_prekey: + spk_elem = ET.SubElement( + bundle_item, "signedPreKeyPublic" + ) + spk_elem.text = signed_prekey + else: + # Fallback: use hash of identity key + import base64 + + spk_elem = ET.SubElement( + bundle_item, "signedPreKeyPublic" + ) + spk_elem.text = base64.b64encode( + identity_key + ).decode() + + # Add identity key + ik_elem = ET.SubElement(bundle_item, "identityKey") + import base64 + + ik_elem.text = base64.b64encode(identity_key).decode() + + # Publish bundle + bundle_node = f"{namespace}/bundles:{device_id}" + await self["xep_0060"].publish( + pubsub_service, bundle_node, payload=bundle_item + ) + self.log.info( + "OMEMO: device bundle published for %s (device_id=%s)", + jid, + device_id, + ) + except Exception as bundle_exc: + self.log.warning( + "OMEMO: device bundle publish failed: %s", bundle_exc + ) + + except Exception as upload_exc: + self.log.warning( + "OMEMO: device/bundle upload error: %s", upload_exc + ) + + # Try to refresh device list to ensure all devices are properly registered. + try: + await session_manager.refresh_device_lists(jid) + self.log.info("OMEMO: device list refreshed for %s", jid) + except Exception as refresh_exc: + self.log.debug("OMEMO: device list refresh: %s", refresh_exc) + except _asyncio.TimeoutError: + self.log.error( + "OMEMO: session manager initialization timeout after 180s. " + "Device list may not be published to PubSub. " + "Clients will not be able to discover gateway devices. " + "Check PubSub server connectivity and latency." + ) + status = "timeout" + reason = ( + "Session manager initialization timeout - device list not published" + ) except Exception as exc: - self.log.warning("OMEMO: could not read own device fingerprint: %s", exc) + self.log.warning( + "OMEMO: could not initialize device information: %s", exc + ) self.log.info( "OMEMO bootstrap: jid=%s enabled=%s status=%s fingerprint=%s", - jid, omemo_enabled, status, fingerprint, + jid, + omemo_enabled, + status, + fingerprint, ) transport.update_runtime_state( "xmpp", @@ -486,19 +835,41 @@ class XMPPComponent(ComponentXMPP): omemo_status_reason=reason, ) - async def _record_sender_omemo_state(self, user, *, sender_jid, recipient_jid, message_stanza): + async def _record_sender_omemo_state( + self, + user, + *, + sender_jid, + recipient_jid, + message_stanza, + sender_fingerprint="", + ): parsed = _extract_sender_omemo_client_key(message_stanza) status = str(parsed.get("status") or "no_omemo") client_key = str(parsed.get("client_key") or "") - await sync_to_async(UserXmppOmemoState.objects.update_or_create)( - user=user, - defaults={ - "status": status, - "latest_client_key": client_key, - "last_sender_jid": str(sender_jid or ""), - "last_target_jid": str(recipient_jid or ""), - }, - ) + + def _save_row(): + row, _ = UserXmppOmemoState.objects.get_or_create(user=user) + details = dict(row.details or {}) + if sender_fingerprint: + details["latest_client_fingerprint"] = str(sender_fingerprint) + row.status = status + row.latest_client_key = client_key + row.last_sender_jid = str(sender_jid or "") + row.last_target_jid = str(recipient_jid or "") + row.details = details + row.save( + update_fields=[ + "status", + "latest_client_key", + "last_sender_jid", + "last_target_jid", + "details", + "updated_at", + ] + ) + + await sync_to_async(_save_row)() _approval_event_prefix = "codex_approval" @@ -525,7 +896,9 @@ class XMPPComponent(ComponentXMPP): run.status = "approved_waiting_resume" if status == "approved" else status await sync_to_async(run.save)(update_fields=["status"]) if request.external_sync_event_id: - evt = await sync_to_async(ExternalSyncEvent.objects.get)(pk=request.external_sync_event_id) + evt = await sync_to_async(ExternalSyncEvent.objects.get)( + pk=request.external_sync_event_id + ) evt.status = "ok" await sync_to_async(evt.save)(update_fields=["status"]) user = await sync_to_async(User.objects.get)(pk=request.user_id) @@ -547,9 +920,9 @@ class XMPPComponent(ComponentXMPP): async def _approval_list_pending(self, user, scope, sym): requests = await sync_to_async(list)( - CodexPermissionRequest.objects.filter( - user=user, status="pending" - ).order_by("-requested_at")[:20] + CodexPermissionRequest.objects.filter(user=user, status="pending").order_by( + "-requested_at" + )[:20] ) sym(f"pending={len(requests)}") for req in requests: @@ -557,9 +930,9 @@ class XMPPComponent(ComponentXMPP): async def _approval_status(self, user, approval_key, sym): try: - req = await sync_to_async( - CodexPermissionRequest.objects.get - )(user=user, approval_key=approval_key) + req = await sync_to_async(CodexPermissionRequest.objects.get)( + user=user, approval_key=approval_key + ) sym(f"status={req.status} key={req.approval_key}") except CodexPermissionRequest.DoesNotExist: sym(f"approval_key_not_found:{approval_key}") @@ -568,7 +941,7 @@ class XMPPComponent(ComponentXMPP): command = body.strip() for prefix, expected_provider in self._APPROVAL_PROVIDER_COMMANDS.items(): if command.startswith(prefix + " ") or command == prefix: - sub = command[len(prefix):].strip() + sub = command[len(prefix) :].strip() parts = sub.split() if len(parts) >= 2 and parts[0] in ("approve", "reject"): action, approval_key = parts[0], parts[1] @@ -583,7 +956,9 @@ class XMPPComponent(ComponentXMPP): return True provider = self._resolve_request_provider(req) if not provider.startswith(expected_provider): - sym(f"approval_key_not_for_provider:{approval_key} provider={provider}") + sym( + f"approval_key_not_for_provider:{approval_key} provider={provider}" + ) return True await self._apply_approval_decision(req, action, sym) sym(f"{action}d: {approval_key}") @@ -594,7 +969,7 @@ class XMPPComponent(ComponentXMPP): if not command.startswith(".approval"): return False - rest = command[len(".approval"):].strip() + rest = command[len(".approval") :].strip() if rest.split() and rest.split()[0] in ("approve", "reject"): parts = rest.split() @@ -617,12 +992,12 @@ class XMPPComponent(ComponentXMPP): return True if rest.startswith("list-pending"): - scope = rest[len("list-pending"):].strip() or "mine" + scope = rest[len("list-pending") :].strip() or "mine" await self._approval_list_pending(user, scope, sym) return True if rest.startswith("status "): - approval_key = rest[len("status "):].strip() + approval_key = rest[len("status ") :].strip() await self._approval_status(user, approval_key, sym) return True @@ -637,7 +1012,7 @@ class XMPPComponent(ComponentXMPP): command = body.strip() if not command.startswith(".tasks"): return False - rest = command[len(".tasks"):].strip() + rest = command[len(".tasks") :].strip() if rest.startswith("list"): parts = rest.split() @@ -656,7 +1031,7 @@ class XMPPComponent(ComponentXMPP): return True if rest.startswith("show "): - ref = rest[len("show "):].strip().lstrip("#") + ref = rest[len("show ") :].strip().lstrip("#") try: task = await sync_to_async(DerivedTask.objects.get)( user=user, reference_code=ref @@ -668,7 +1043,7 @@ class XMPPComponent(ComponentXMPP): return True if rest.startswith("complete "): - ref = rest[len("complete "):].strip().lstrip("#") + ref = rest[len("complete ") :].strip().lstrip("#") try: task = await sync_to_async(DerivedTask.objects.get)( user=user, reference_code=ref @@ -681,7 +1056,7 @@ class XMPPComponent(ComponentXMPP): return True if rest.startswith("undo "): - ref = rest[len("undo "):].strip().lstrip("#") + ref = rest[len("undo ") :].strip().lstrip("#") try: task = await sync_to_async(DerivedTask.objects.get)( user=user, reference_code=ref @@ -710,7 +1085,7 @@ class XMPPComponent(ComponentXMPP): query = parse_qs(parsed.query or "") return str((query.get("secret") or [""])[0] or "").strip() if lowered.startswith(".totp"): - rest = text[len(".totp"):].strip() + rest = text[len(".totp") :].strip() if not rest: return "" parts = rest.split(maxsplit=1) @@ -720,9 +1095,6 @@ class XMPPComponent(ComponentXMPP): if action in {"status", "help"}: return "" return rest - compact = text.replace(" ", "").strip().upper() - if TOTP_BASE32_SECRET_RE.match(compact): - return compact return "" async def _handle_totp_command(self, user, body, sym): @@ -763,11 +1135,7 @@ class XMPPComponent(ComponentXMPP): def _save_device(): from django_otp.plugins.otp_totp.models import TOTPDevice - device = ( - TOTPDevice.objects.filter(user=user) - .order_by("-id") - .first() - ) + device = TOTPDevice.objects.filter(user=user).order_by("-id").first() if device is None: device = TOTPDevice(user=user, name="gateway") device.key = key_bytes.hex() @@ -798,7 +1166,9 @@ class XMPPComponent(ComponentXMPP): command_text = str(body or "").strip() async def _contacts_handler(_ctx, emit): - persons = await sync_to_async(list)(Person.objects.filter(user=sender_user).order_by("name")) + persons = await sync_to_async(list)( + Person.objects.filter(user=sender_user).order_by("name") + ) if not persons: emit("No contacts found.") return True @@ -815,7 +1185,9 @@ class XMPPComponent(ComponentXMPP): return True async def _approval_handler(_ctx, emit): - return await self._handle_approval_command(sender_user, command_text, sender_jid, emit) + return await self._handle_approval_command( + sender_user, command_text, sender_jid, emit + ) async def _tasks_handler(_ctx, emit): return await self._handle_tasks_command(sender_user, command_text, emit) @@ -845,7 +1217,10 @@ class XMPPComponent(ComponentXMPP): GatewayCommandRoute( name="approval", scope_key="gateway.approval", - matcher=lambda text: str(text or "").strip().lower().startswith(".approval") + matcher=lambda text: str(text or "") + .strip() + .lower() + .startswith(".approval") or any( str(text or "").strip().lower().startswith(prefix + " ") or str(text or "").strip().lower() == prefix @@ -856,7 +1231,10 @@ class XMPPComponent(ComponentXMPP): GatewayCommandRoute( name="tasks", scope_key="gateway.tasks", - matcher=lambda text: str(text or "").strip().lower().startswith(".tasks"), + matcher=lambda text: str(text or "") + .strip() + .lower() + .startswith(".tasks"), handler=_tasks_handler, ), GatewayCommandRoute( @@ -1365,16 +1743,36 @@ class XMPPComponent(ComponentXMPP): def on_presence_subscribe(self, pres): """ Handle incoming presence subscription requests. - Accept only if the recipient has a contact matching the sender. + Accept subscriptions to: + 1. The gateway component itself (jews.zm.is) - for OMEMO device discovery + 2. User contacts at the gateway (user|service@jews.zm.is) - for user-to-user messaging """ sender_jid = str(pres["from"]).split("/")[0] # Bare JID (user@domain) recipient_jid = str(pres["to"]).split("/")[0] + component_jid = str(self.boundjid.bare) self.log.debug( f"Received subscription request from {sender_jid} to {recipient_jid}" ) + # Check if subscription is to the gateway component itself + if recipient_jid == component_jid: + # Auto-accept subscriptions to the gateway component (for OMEMO) + self.log.info( + "Auto-accepting subscription to gateway component from %s", sender_jid + ) + self.send_presence(ptype="subscribed", pto=sender_jid, pfrom=component_jid) + + # Send presence availability to enable device discovery + self.send_presence(ptype="available", pto=sender_jid, pfrom=component_jid) + self.log.info( + "Gateway component is available to %s (OMEMO device discovery enabled)", + sender_jid, + ) + return + + # Otherwise, handle user-to-user subscription (existing logic) try: # Extract sender and recipient usernames user_username, _ = sender_jid.split("@", 1) @@ -1400,24 +1798,24 @@ class XMPPComponent(ComponentXMPP): self.log.debug("Resolving subscription identifier service=%s", service) PersonIdentifier.objects.get(user=user, person=person, service=service) - component_jid = f"{person_name.lower()}|{service}@{self.boundjid.bare}" + contact_jid = f"{person_name.lower()}|{service}@{self.boundjid.bare}" # Accept the subscription - self.send_presence(ptype="subscribed", pto=sender_jid, pfrom=component_jid) + self.send_presence(ptype="subscribed", pto=sender_jid, pfrom=contact_jid) self.log.debug( - f"Accepted subscription from {sender_jid}, sent from {component_jid}" + f"Accepted subscription from {sender_jid}, sent from {contact_jid}" ) # Send a presence request **from the recipient to the sender** (ASKS THEM TO ACCEPT BACK) - # self.send_presence(ptype="subscribe", pto=sender_jid, pfrom=component_jid) + # self.send_presence(ptype="subscribe", pto=sender_jid, pfrom=contact_jid) # Add sender to roster # self.update_roster(sender_jid, name=sender_jid.split("@")[0]) # Send presence update to sender **from the correct JID** - self.send_presence(ptype="available", pto=sender_jid, pfrom=component_jid) + self.send_presence(ptype="available", pto=sender_jid, pfrom=contact_jid) self.log.debug( - "Sent presence update from %s to %s", component_jid, sender_jid + "Sent presence update from %s to %s", contact_jid, sender_jid ) except (User.DoesNotExist, Person.DoesNotExist, PersonIdentifier.DoesNotExist): @@ -1645,14 +2043,20 @@ class XMPPComponent(ComponentXMPP): # Attempt to decrypt OMEMO-encrypted messages before body extraction. original_msg = msg omemo_plugin = self._get_omemo_plugin() + sender_omemo_fingerprint = "" if omemo_plugin: try: if omemo_plugin.is_encrypted(msg): - decrypted, _ = await omemo_plugin.decrypt_message(msg) + decrypted, sender_device = await omemo_plugin.decrypt_message(msg) msg = decrypted + sender_omemo_fingerprint = _format_omemo_identity_fingerprint( + getattr(sender_device, "identity_key", b"") + ) self.log.debug("OMEMO: decrypted message from %s", sender_jid) except Exception as exc: - self.log.warning("OMEMO: decryption failed from %s: %s", sender_jid, exc) + self.log.warning( + "OMEMO: decryption failed from %s: %s", sender_jid, exc + ) # Extract message body body = msg["body"] if msg["body"] else "" @@ -1678,7 +2082,9 @@ class XMPPComponent(ComponentXMPP): or "application/octet-stream", ) except Exception as exc: - self.log.warning("xmpp dropped unsafe attachment url=%s: %s", url_value, exc) + self.log.warning( + "xmpp dropped unsafe attachment url=%s: %s", url_value, exc + ) continue attachments.append( { @@ -1723,7 +2129,9 @@ class XMPPComponent(ComponentXMPP): content_type=_content_type_from_filename_or_url(safe_url), ) except Exception as exc: - self.log.warning("xmpp dropped extracted unsafe url=%s: %s", url_value, exc) + self.log.warning( + "xmpp dropped extracted unsafe url=%s: %s", url_value, exc + ) continue attachments.append( { @@ -1787,6 +2195,7 @@ class XMPPComponent(ComponentXMPP): sender_jid=sender_jid, recipient_jid=recipient_jid, message_stanza=original_msg, + sender_fingerprint=sender_omemo_fingerprint, ) except Exception as exc: self.log.warning("OMEMO: failed to record sender state: %s", exc) @@ -1795,8 +2204,11 @@ class XMPPComponent(ComponentXMPP): # Enforce mandatory encryption policy. try: from core.models import UserXmppSecuritySettings + sec_settings = await sync_to_async( - lambda: UserXmppSecuritySettings.objects.filter(user=sender_user).first() + lambda: UserXmppSecuritySettings.objects.filter( + user=sender_user + ).first() )() if sec_settings and sec_settings.require_omemo: omemo_status = str(omemo_observation.get("status") or "") @@ -1812,7 +2224,7 @@ class XMPPComponent(ComponentXMPP): if recipient_jid == settings.XMPP_JID: self.log.debug("Handling command message sent to gateway JID") - if body.startswith(".") or self._extract_totp_secret_candidate(body): + if body.startswith("."): await self._route_gateway_command( sender_user=sender_user, body=body, @@ -1824,7 +2236,9 @@ class XMPPComponent(ComponentXMPP): "sender_jid": str(sender_jid or ""), "recipient_jid": str(recipient_jid or ""), "omemo_status": str(omemo_observation.get("status") or ""), - "omemo_client_key": str(omemo_observation.get("client_key") or ""), + "omemo_client_key": str( + omemo_observation.get("client_key") or "" + ), } }, sym=sym, @@ -2004,7 +2418,9 @@ class XMPPComponent(ComponentXMPP): "sender_jid": str(sender_jid or ""), "recipient_jid": str(recipient_jid or ""), "omemo_status": str(omemo_observation.get("status") or ""), - "omemo_client_key": str(omemo_observation.get("client_key") or ""), + "omemo_client_key": str( + omemo_observation.get("client_key") or "" + ), } }, ) @@ -2127,9 +2543,7 @@ class XMPPComponent(ComponentXMPP): f"Upload failed: {response.status} {await response.text()}" ) return None - self.log.debug( - "Successfully uploaded %s to %s", filename, upload_url - ) + self.log.debug("Successfully uploaded %s to %s", filename, upload_url) # Send XMPP message immediately after successful upload xmpp_msg_id = await self.send_xmpp_message( @@ -2145,7 +2559,13 @@ class XMPPComponent(ComponentXMPP): return None async def send_xmpp_message( - self, recipient_jid, sender_jid, body_text, attachment_url=None + self, + recipient_jid, + sender_jid, + body_text, + attachment_url=None, + *, + use_omemo_encryption=True, ): """Sends an XMPP message with either text or an attachment URL.""" msg = self.make_message(mto=recipient_jid, mfrom=sender_jid, mtype="chat") @@ -2163,29 +2583,35 @@ class XMPPComponent(ComponentXMPP): self.log.debug("Sending XMPP message: %s", msg.xml) - # Attempt OMEMO encryption for text-only messages (not attachments). - if not attachment_url: + # Attempt OMEMO encryption for text-only messages (not attachments) + # when outbound policy allows it. + if not attachment_url and use_omemo_encryption: omemo_plugin = self._get_omemo_plugin() if omemo_plugin: try: from slixmpp.jid import JID as _JID + encrypted_msgs, enc_errors = await omemo_plugin.encrypt_message( msg, _JID(recipient_jid) ) if enc_errors: self.log.debug( "OMEMO: non-critical encryption errors for %s: %s", - recipient_jid, enc_errors, + recipient_jid, + enc_errors, ) if encrypted_msgs: for enc_msg in encrypted_msgs.values(): enc_msg.send() - self.log.debug("OMEMO: sent encrypted message to %s", recipient_jid) + self.log.debug( + "OMEMO: sent encrypted message to %s", recipient_jid + ) return msg_id except Exception as exc: self.log.debug( "OMEMO: encryption not available for %s, sending plaintext: %s", - recipient_jid, exc, + recipient_jid, + exc, ) msg.send() @@ -2347,6 +2773,19 @@ class XMPPComponent(ComponentXMPP): sender_jid = f"{person_identifier.person.name.lower()}|{person_identifier.service}@{settings.XMPP_JID}" recipient_jid = self._user_jid(person_identifier.user.username) + relay_encrypt_with_omemo = True + try: + from core.models import UserXmppSecuritySettings + + sec_settings = await sync_to_async( + lambda: UserXmppSecuritySettings.objects.filter(user=user).first() + )() + if sec_settings is not None: + relay_encrypt_with_omemo = bool( + getattr(sec_settings, "encrypt_contact_messages_with_omemo", True) + ) + except Exception as exc: + self.log.warning("XMPP relay OMEMO settings lookup failed: %s", exc) if is_outgoing_message: xmpp_id = await self.send_xmpp_message( recipient_jid, @@ -2385,7 +2824,12 @@ class XMPPComponent(ComponentXMPP): # Step 1: Send text message separately elif text: - xmpp_id = await self.send_xmpp_message(recipient_jid, sender_jid, text) + xmpp_id = await self.send_xmpp_message( + recipient_jid, + sender_jid, + text, + use_omemo_encryption=relay_encrypt_with_omemo, + ) transport.record_bridge_mapping( user_id=user.id, person_id=person_identifier.person_id, @@ -2512,17 +2956,25 @@ class XMPPClient(ClientBase): self._omemo_plugin_registered = False if _OMEMO_AVAILABLE: try: - data_dir = str(getattr(settings, "XMPP_OMEMO_DATA_DIR", "") or "").strip() + data_dir = str( + getattr(settings, "XMPP_OMEMO_DATA_DIR", "") or "" + ).strip() if not data_dir: data_dir = str(Path(settings.BASE_DIR) / "xmpp_omemo_data") # Register our concrete plugin class under the "xep_0384" name so # that slixmpp's dependency resolver finds it. _slixmpp_register_plugin(_GiaOmemoPlugin) - self.client.register_plugin("xep_0384", pconfig={"data_dir": data_dir}) + self.client.register_plugin( + "xep_0384", pconfig={"data_dir": data_dir} + ) self._omemo_plugin_registered = True - self.log.info("OMEMO: xep_0384 plugin registered, data_dir=%s", data_dir) + self.log.info( + "OMEMO: xep_0384 plugin registered, data_dir=%s", data_dir + ) except Exception as exc: - self.log.warning("OMEMO: failed to register xep_0384 plugin: %s", exc) + self.log.warning( + "OMEMO: failed to register xep_0384 plugin: %s", exc + ) else: self.log.warning("OMEMO: slixmpp_omemo not available, OMEMO disabled") diff --git a/core/commands/delivery.py b/core/commands/delivery.py index eb37a88..a42002a 100644 --- a/core/commands/delivery.py +++ b/core/commands/delivery.py @@ -31,7 +31,9 @@ def chunk_for_transport(text: str, limit: int = 3000) -> list[str]: return [part for part in parts if part] -async def post_status_in_source(trigger_message: Message, text: str, origin_tag: str) -> bool: +async def post_status_in_source( + trigger_message: Message, text: str, origin_tag: str +) -> bool: service = str(trigger_message.source_service or "").strip().lower() if service not in STATUS_VISIBLE_SOURCE_SERVICES: return False @@ -76,9 +78,10 @@ async def post_to_channel_binding( channel_identifier = str(binding_channel_identifier or "").strip() if service == "web": session = None - if channel_identifier and channel_identifier == str( - trigger_message.source_chat_id or "" - ).strip(): + if ( + channel_identifier + and channel_identifier == str(trigger_message.source_chat_id or "").strip() + ): session = trigger_message.session if session is None and channel_identifier: session = await sync_to_async( @@ -99,7 +102,8 @@ async def post_to_channel_binding( ts=int(time.time() * 1000), custom_author="BOT", source_service="web", - source_chat_id=channel_identifier or str(trigger_message.source_chat_id or ""), + source_chat_id=channel_identifier + or str(trigger_message.source_chat_id or ""), message_meta={"origin_tag": origin_tag}, ) return True diff --git a/core/commands/engine.py b/core/commands/engine.py index 8d9f655..8643808 100644 --- a/core/commands/engine.py +++ b/core/commands/engine.py @@ -58,9 +58,15 @@ def _effective_bootstrap_scope( identifier = str(ctx.channel_identifier or "").strip() if service != "web": return service, identifier - session_identifier = getattr(getattr(trigger_message, "session", None), "identifier", None) - fallback_service = str(getattr(session_identifier, "service", "") or "").strip().lower() - fallback_identifier = str(getattr(session_identifier, "identifier", "") or "").strip() + session_identifier = getattr( + getattr(trigger_message, "session", None), "identifier", None + ) + fallback_service = ( + str(getattr(session_identifier, "service", "") or "").strip().lower() + ) + fallback_identifier = str( + getattr(session_identifier, "identifier", "") or "" + ).strip() if fallback_service and fallback_identifier and fallback_service != "web": return fallback_service, fallback_identifier return service, identifier @@ -89,7 +95,11 @@ def _ensure_bp_profile(user_id: int) -> CommandProfile: if str(profile.trigger_token or "").strip() != ".bp": profile.trigger_token = ".bp" profile.save(update_fields=["trigger_token", "updated_at"]) - for action_type, position in (("extract_bp", 0), ("save_document", 1), ("post_result", 2)): + for action_type, position in ( + ("extract_bp", 0), + ("save_document", 1), + ("post_result", 2), + ): action, created = CommandAction.objects.get_or_create( profile=profile, action_type=action_type, @@ -327,7 +337,9 @@ async def process_inbound_message(ctx: CommandContext) -> list[CommandResult]: return [] if is_mirrored_origin(trigger_message.message_meta): return [] - effective_service, effective_channel = _effective_bootstrap_scope(ctx, trigger_message) + effective_service, effective_channel = _effective_bootstrap_scope( + ctx, trigger_message + ) security_context = CommandSecurityContext( service=effective_service, channel_identifier=effective_channel, @@ -394,7 +406,9 @@ async def process_inbound_message(ctx: CommandContext) -> list[CommandResult]: result = await handler.execute(ctx) results.append(result) except Exception as exc: - log.exception("command execution failed for profile=%s: %s", profile.slug, exc) + log.exception( + "command execution failed for profile=%s: %s", profile.slug, exc + ) results.append( CommandResult( ok=False, diff --git a/core/commands/handlers/bp.py b/core/commands/handlers/bp.py index a238a27..2107143 100644 --- a/core/commands/handlers/bp.py +++ b/core/commands/handlers/bp.py @@ -45,14 +45,15 @@ class BPParsedCommand(dict): return str(self.get("remainder_text") or "") - def parse_bp_subcommand(text: str) -> BPParsedCommand: body = str(text or "") if _BP_SET_RANGE_RE.match(body): return BPParsedCommand(command="set_range", remainder_text="") match = _BP_SET_RE.match(body) if match: - return BPParsedCommand(command="set", remainder_text=str(match.group("rest") or "").strip()) + return BPParsedCommand( + command="set", remainder_text=str(match.group("rest") or "").strip() + ) return BPParsedCommand(command=None, remainder_text="") @@ -63,7 +64,9 @@ def bp_subcommands_enabled() -> bool: return bool(raw) -def bp_trigger_matches(message_text: str, trigger_token: str, exact_match_only: bool) -> bool: +def bp_trigger_matches( + message_text: str, trigger_token: str, exact_match_only: bool +) -> bool: body = str(message_text or "").strip() trigger = str(trigger_token or "").strip() parsed = parse_bp_subcommand(body) @@ -144,7 +147,8 @@ class BPCommandHandler(CommandHandler): "enabled": True, "generation_mode": "ai" if variant_key == "bp" else "verbatim", "send_plan_to_egress": "post_result" in action_types, - "send_status_to_source": str(profile.visibility_mode or "") == "status_in_source", + "send_status_to_source": str(profile.visibility_mode or "") + == "status_in_source", "send_status_to_egress": False, "store_document": True, } @@ -224,10 +228,14 @@ class BPCommandHandler(CommandHandler): ts__lte=int(trigger.ts or 0), ) .order_by("ts") - .select_related("session", "session__identifier", "session__identifier__person") + .select_related( + "session", "session__identifier", "session__identifier__person" + ) ) - def _annotation(self, mode: str, message_count: int, has_addendum: bool = False) -> str: + def _annotation( + self, mode: str, message_count: int, has_addendum: bool = False + ) -> str: if mode == "set" and has_addendum: return "Generated from 1 message + 1 addendum." if message_count == 1: @@ -291,21 +299,29 @@ class BPCommandHandler(CommandHandler): if anchor is None: run.status = "failed" run.error = "bp_set_range_requires_reply_target" - await sync_to_async(run.save)(update_fields=["status", "error", "updated_at"]) + await sync_to_async(run.save)( + update_fields=["status", "error", "updated_at"] + ) return CommandResult(ok=False, status="failed", error=run.error) rows = await self._load_window(trigger, anchor) deterministic_content = plain_text_blob(rows) if not deterministic_content.strip(): run.status = "failed" run.error = "bp_set_range_empty_content" - await sync_to_async(run.save)(update_fields=["status", "error", "updated_at"]) + await sync_to_async(run.save)( + update_fields=["status", "error", "updated_at"] + ) return CommandResult(ok=False, status="failed", error=run.error) if str(policy.get("generation_mode") or "verbatim") == "ai": - ai_obj = await sync_to_async(lambda: AI.objects.filter(user=trigger.user).first())() + ai_obj = await sync_to_async( + lambda: AI.objects.filter(user=trigger.user).first() + )() if ai_obj is None: run.status = "failed" run.error = "ai_not_configured" - await sync_to_async(run.save)(update_fields=["status", "error", "updated_at"]) + await sync_to_async(run.save)( + update_fields=["status", "error", "updated_at"] + ) return CommandResult(ok=False, status="failed", error=run.error) prompt = [ { @@ -329,12 +345,16 @@ class BPCommandHandler(CommandHandler): except Exception as exc: run.status = "failed" run.error = f"bp_ai_failed:{exc}" - await sync_to_async(run.save)(update_fields=["status", "error", "updated_at"]) + await sync_to_async(run.save)( + update_fields=["status", "error", "updated_at"] + ) return CommandResult(ok=False, status="failed", error=run.error) if not content: run.status = "failed" run.error = "empty_ai_response" - await sync_to_async(run.save)(update_fields=["status", "error", "updated_at"]) + await sync_to_async(run.save)( + update_fields=["status", "error", "updated_at"] + ) return CommandResult(ok=False, status="failed", error=run.error) else: content = deterministic_content @@ -360,9 +380,7 @@ class BPCommandHandler(CommandHandler): elif anchor is not None and remainder: base = str(anchor.text or "").strip() or "(no text)" content = ( - f"{base}\n" - "--- Addendum (newer message text) ---\n" - f"{remainder}" + f"{base}\n" "--- Addendum (newer message text) ---\n" f"{remainder}" ) source_ids.extend([str(anchor.id), str(trigger.id)]) has_addendum = True @@ -373,15 +391,21 @@ class BPCommandHandler(CommandHandler): else: run.status = "failed" run.error = "bp_set_empty_content" - await sync_to_async(run.save)(update_fields=["status", "error", "updated_at"]) + await sync_to_async(run.save)( + update_fields=["status", "error", "updated_at"] + ) return CommandResult(ok=False, status="failed", error=run.error) if str(policy.get("generation_mode") or "verbatim") == "ai": - ai_obj = await sync_to_async(lambda: AI.objects.filter(user=trigger.user).first())() + ai_obj = await sync_to_async( + lambda: AI.objects.filter(user=trigger.user).first() + )() if ai_obj is None: run.status = "failed" run.error = "ai_not_configured" - await sync_to_async(run.save)(update_fields=["status", "error", "updated_at"]) + await sync_to_async(run.save)( + update_fields=["status", "error", "updated_at"] + ) return CommandResult(ok=False, status="failed", error=run.error) prompt = [ { @@ -405,16 +429,22 @@ class BPCommandHandler(CommandHandler): except Exception as exc: run.status = "failed" run.error = f"bp_ai_failed:{exc}" - await sync_to_async(run.save)(update_fields=["status", "error", "updated_at"]) + await sync_to_async(run.save)( + update_fields=["status", "error", "updated_at"] + ) return CommandResult(ok=False, status="failed", error=run.error) if not ai_content: run.status = "failed" run.error = "empty_ai_response" - await sync_to_async(run.save)(update_fields=["status", "error", "updated_at"]) + await sync_to_async(run.save)( + update_fields=["status", "error", "updated_at"] + ) return CommandResult(ok=False, status="failed", error=run.error) content = ai_content - annotation = self._annotation("set", 1 if not has_addendum else 2, has_addendum) + annotation = self._annotation( + "set", 1 if not has_addendum else 2, has_addendum + ) doc = None if bool(policy.get("store_document", True)): doc = await self._persist_document( @@ -430,7 +460,9 @@ class BPCommandHandler(CommandHandler): else: run.status = "failed" run.error = "bp_unknown_subcommand" - await sync_to_async(run.save)(update_fields=["status", "error", "updated_at"]) + await sync_to_async(run.save)( + update_fields=["status", "error", "updated_at"] + ) return CommandResult(ok=False, status="failed", error=run.error) fanout_stats = {"sent_bindings": 0, "failed_bindings": 0} @@ -479,7 +511,9 @@ class BPCommandHandler(CommandHandler): if trigger.reply_to_id is None: run.status = "failed" run.error = "bp_requires_reply_target" - await sync_to_async(run.save)(update_fields=["status", "error", "updated_at"]) + await sync_to_async(run.save)( + update_fields=["status", "error", "updated_at"] + ) return CommandResult(ok=False, status="failed", error=run.error) anchor = trigger.reply_to @@ -488,7 +522,9 @@ class BPCommandHandler(CommandHandler): rows, author_rewrites={"USER": "Operator", "BOT": "Assistant"}, ) - max_transcript_chars = int(getattr(settings, "BP_MAX_TRANSCRIPT_CHARS", 12000) or 12000) + max_transcript_chars = int( + getattr(settings, "BP_MAX_TRANSCRIPT_CHARS", 12000) or 12000 + ) transcript = _clamp_transcript(transcript, max_transcript_chars) default_template = ( "Business Plan:\n" @@ -499,7 +535,9 @@ class BPCommandHandler(CommandHandler): "- Risks" ) template_text = profile.template_text or default_template - max_template_chars = int(getattr(settings, "BP_MAX_TEMPLATE_CHARS", 5000) or 5000) + max_template_chars = int( + getattr(settings, "BP_MAX_TEMPLATE_CHARS", 5000) or 5000 + ) template_text = str(template_text or "")[:max_template_chars] generation_mode = str(policy.get("generation_mode") or "ai") if generation_mode == "verbatim": @@ -507,14 +545,20 @@ class BPCommandHandler(CommandHandler): if not summary.strip(): run.status = "failed" run.error = "bp_verbatim_empty_content" - await sync_to_async(run.save)(update_fields=["status", "error", "updated_at"]) + await sync_to_async(run.save)( + update_fields=["status", "error", "updated_at"] + ) return CommandResult(ok=False, status="failed", error=run.error) else: - ai_obj = await sync_to_async(lambda: AI.objects.filter(user=trigger.user).first())() + ai_obj = await sync_to_async( + lambda: AI.objects.filter(user=trigger.user).first() + )() if ai_obj is None: run.status = "failed" run.error = "ai_not_configured" - await sync_to_async(run.save)(update_fields=["status", "error", "updated_at"]) + await sync_to_async(run.save)( + update_fields=["status", "error", "updated_at"] + ) return CommandResult(ok=False, status="failed", error=run.error) prompt = [ @@ -530,13 +574,20 @@ class BPCommandHandler(CommandHandler): }, ] try: - summary = str(await ai_runner.run_prompt(prompt, ai_obj, operation="command_bp_extract") or "").strip() + summary = str( + await ai_runner.run_prompt( + prompt, ai_obj, operation="command_bp_extract" + ) + or "" + ).strip() if not summary: raise RuntimeError("empty_ai_response") except Exception as exc: run.status = "failed" run.error = f"bp_ai_failed:{exc}" - await sync_to_async(run.save)(update_fields=["status", "error", "updated_at"]) + await sync_to_async(run.save)( + update_fields=["status", "error", "updated_at"] + ) return CommandResult(ok=False, status="failed", error=run.error) annotation = self._annotation("legacy", len(rows)) @@ -588,23 +639,31 @@ class BPCommandHandler(CommandHandler): async def execute(self, ctx: CommandContext) -> CommandResult: trigger = await sync_to_async( - lambda: Message.objects.select_related("user", "session").filter(id=ctx.message_id).first() + lambda: Message.objects.select_related("user", "session") + .filter(id=ctx.message_id) + .first() )() if trigger is None: return CommandResult(ok=False, status="failed", error="trigger_not_found") profile = await sync_to_async( - lambda: trigger.user.commandprofile_set.filter(slug=self.slug, enabled=True).first() + lambda: trigger.user.commandprofile_set.filter( + slug=self.slug, enabled=True + ).first() )() if profile is None: return CommandResult(ok=False, status="skipped", error="profile_missing") actions = await sync_to_async(list)( - CommandAction.objects.filter(profile=profile, enabled=True).order_by("position", "id") + CommandAction.objects.filter(profile=profile, enabled=True).order_by( + "position", "id" + ) ) action_types = {row.action_type for row in actions} if "extract_bp" not in action_types: - return CommandResult(ok=False, status="skipped", error="extract_bp_disabled") + return CommandResult( + ok=False, status="skipped", error="extract_bp_disabled" + ) run, created = await sync_to_async(CommandRun.objects.get_or_create)( profile=profile, @@ -612,7 +671,11 @@ class BPCommandHandler(CommandHandler): defaults={"user": trigger.user, "status": "running"}, ) if not created and run.status in {"ok", "running"}: - return CommandResult(ok=True, status="ok", payload={"document_id": str(run.result_ref_id or "")}) + return CommandResult( + ok=True, + status="ok", + payload={"document_id": str(run.result_ref_id or "")}, + ) run.status = "running" run.error = "" @@ -627,7 +690,9 @@ class BPCommandHandler(CommandHandler): if not bool(policy.get("enabled")): run.status = "skipped" run.error = f"variant_disabled:{variant_key}" - await sync_to_async(run.save)(update_fields=["status", "error", "updated_at"]) + await sync_to_async(run.save)( + update_fields=["status", "error", "updated_at"] + ) return CommandResult(ok=False, status="skipped", error=run.error) parsed = parse_bp_subcommand(ctx.message_text) diff --git a/core/commands/handlers/claude.py b/core/commands/handlers/claude.py index ff1cb0a..4bed6ea 100644 --- a/core/commands/handlers/claude.py +++ b/core/commands/handlers/claude.py @@ -20,8 +20,8 @@ from core.models import ( TaskProject, TaskProviderConfig, ) -from core.tasks.codex_support import channel_variants, resolve_external_chat_id from core.tasks.codex_approval import queue_codex_event_with_pre_approval +from core.tasks.codex_support import channel_variants, resolve_external_chat_id _CLAUDE_DEFAULT_RE = re.compile( r"^\s*(?:\.claude\b|#claude#?)(?P.*)$", @@ -31,7 +31,9 @@ _CLAUDE_PLAN_RE = re.compile( r"^\s*(?:\.claude\s+plan\b|#claude\s+plan#?)(?P.*)$", re.IGNORECASE | re.DOTALL, ) -_CLAUDE_STATUS_RE = re.compile(r"^\s*(?:\.claude\s+status\b|#claude\s+status#?)\s*$", re.IGNORECASE) +_CLAUDE_STATUS_RE = re.compile( + r"^\s*(?:\.claude\s+status\b|#claude\s+status#?)\s*$", re.IGNORECASE +) _CLAUDE_APPROVE_DENY_RE = re.compile( r"^\s*(?:\.claude|#claude)\s+(?Papprove|deny)\s+(?P[A-Za-z0-9._:-]+)#?\s*$", re.IGNORECASE, @@ -83,7 +85,9 @@ def parse_claude_command(text: str) -> ClaudeParsedCommand: return ClaudeParsedCommand(command=None, body_text="", approval_key="") -def claude_trigger_matches(message_text: str, trigger_token: str, exact_match_only: bool) -> bool: +def claude_trigger_matches( + message_text: str, trigger_token: str, exact_match_only: bool +) -> bool: body = str(message_text or "").strip() parsed = parse_claude_command(body) if parsed.command: @@ -103,7 +107,9 @@ class ClaudeCommandHandler(CommandHandler): async def _load_trigger(self, message_id: str) -> Message | None: return await sync_to_async( - lambda: Message.objects.select_related("user", "session", "session__identifier", "reply_to") + lambda: Message.objects.select_related( + "user", "session", "session__identifier", "reply_to" + ) .filter(id=message_id) .first() )() @@ -114,11 +120,18 @@ class ClaudeCommandHandler(CommandHandler): identifier = getattr(getattr(trigger, "session", None), "identifier", None) fallback_service = str(getattr(identifier, "service", "") or "").strip().lower() fallback_identifier = str(getattr(identifier, "identifier", "") or "").strip() - if service == "web" and fallback_service and fallback_identifier and fallback_service != "web": + if ( + service == "web" + and fallback_service + and fallback_identifier + and fallback_service != "web" + ): return fallback_service, fallback_identifier return service or "web", channel - async def _mapped_sources(self, user, service: str, channel: str) -> list[ChatTaskSource]: + async def _mapped_sources( + self, user, service: str, channel: str + ) -> list[ChatTaskSource]: variants = channel_variants(service, channel) if not variants: return [] @@ -131,7 +144,9 @@ class ClaudeCommandHandler(CommandHandler): ).select_related("project", "epic") ) - async def _linked_task_from_reply(self, user, reply_to: Message | None) -> DerivedTask | None: + async def _linked_task_from_reply( + self, user, reply_to: Message | None + ) -> DerivedTask | None: if reply_to is None: return None by_origin = await sync_to_async( @@ -143,7 +158,9 @@ class ClaudeCommandHandler(CommandHandler): if by_origin is not None: return by_origin return await sync_to_async( - lambda: DerivedTask.objects.filter(user=user, events__source_message=reply_to) + lambda: DerivedTask.objects.filter( + user=user, events__source_message=reply_to + ) .select_related("project", "epic") .order_by("-created_at") .first() @@ -164,10 +181,14 @@ class ClaudeCommandHandler(CommandHandler): return "" return str(m.group(1) or "").strip() - async def _resolve_task(self, user, reference_code: str, reply_task: DerivedTask | None) -> DerivedTask | None: + async def _resolve_task( + self, user, reference_code: str, reply_task: DerivedTask | None + ) -> DerivedTask | None: if reference_code: return await sync_to_async( - lambda: DerivedTask.objects.filter(user=user, reference_code=reference_code) + lambda: DerivedTask.objects.filter( + user=user, reference_code=reference_code + ) .select_related("project", "epic") .order_by("-created_at") .first() @@ -190,7 +211,9 @@ class ClaudeCommandHandler(CommandHandler): return reply_task.project, "" if project_token: project = await sync_to_async( - lambda: TaskProject.objects.filter(user=user, name__iexact=project_token).first() + lambda: TaskProject.objects.filter( + user=user, name__iexact=project_token + ).first() )() if project is not None: return project, "" @@ -199,20 +222,31 @@ class ClaudeCommandHandler(CommandHandler): mapped = await self._mapped_sources(user, service, channel) project_ids = sorted({str(row.project_id) for row in mapped if row.project_id}) if len(project_ids) == 1: - project = next((row.project for row in mapped if str(row.project_id) == project_ids[0]), None) + project = next( + ( + row.project + for row in mapped + if str(row.project_id) == project_ids[0] + ), + None, + ) return project, "" if len(project_ids) > 1: return None, "project_required:[project:Name]" return None, "project_unresolved" - async def _post_source_status(self, trigger: Message, text: str, suffix: str) -> None: + async def _post_source_status( + self, trigger: Message, text: str, suffix: str + ) -> None: await post_status_in_source( trigger_message=trigger, text=text, origin_tag=f"claude-status:{suffix}", ) - async def _run_status(self, trigger: Message, service: str, channel: str, project: TaskProject | None) -> CommandResult: + async def _run_status( + self, trigger: Message, service: str, channel: str, project: TaskProject | None + ) -> CommandResult: def _load_runs(): qs = CodexRun.objects.filter(user=trigger.user) if service: @@ -225,7 +259,9 @@ class ClaudeCommandHandler(CommandHandler): runs = await sync_to_async(_load_runs)() if not runs: - await self._post_source_status(trigger, "[claude] no recent runs for this scope.", "empty") + await self._post_source_status( + trigger, "[claude] no recent runs for this scope.", "empty" + ) return CommandResult(ok=True, status="ok", payload={"count": 0}) lines = ["[claude] recent runs:"] for row in runs: @@ -249,24 +285,38 @@ class ClaudeCommandHandler(CommandHandler): ).first() )() settings_payload = dict(getattr(cfg, "settings", {}) or {}) - approver_service = str(settings_payload.get("approver_service") or "").strip().lower() - approver_identifier = str(settings_payload.get("approver_identifier") or "").strip() + approver_service = ( + str(settings_payload.get("approver_service") or "").strip().lower() + ) + approver_identifier = str( + settings_payload.get("approver_identifier") or "" + ).strip() if not approver_service or not approver_identifier: - return CommandResult(ok=False, status="failed", error="approver_channel_not_configured") + return CommandResult( + ok=False, status="failed", error="approver_channel_not_configured" + ) - if str(current_service or "").strip().lower() != approver_service or str(current_channel or "").strip() not in set( - channel_variants(approver_service, approver_identifier) - ): - return CommandResult(ok=False, status="failed", error="approval_command_not_allowed_in_this_channel") + if str(current_service or "").strip().lower() != approver_service or str( + current_channel or "" + ).strip() not in set(channel_variants(approver_service, approver_identifier)): + return CommandResult( + ok=False, + status="failed", + error="approval_command_not_allowed_in_this_channel", + ) approval_key = parsed.approval_key request = await sync_to_async( - lambda: CodexPermissionRequest.objects.select_related("codex_run", "external_sync_event") + lambda: CodexPermissionRequest.objects.select_related( + "codex_run", "external_sync_event" + ) .filter(user=trigger.user, approval_key=approval_key) .first() )() if request is None: - return CommandResult(ok=False, status="failed", error="approval_key_not_found") + return CommandResult( + ok=False, status="failed", error="approval_key_not_found" + ) now = timezone.now() if parsed.command == "approve": @@ -283,14 +333,20 @@ class ClaudeCommandHandler(CommandHandler): ] ) if request.external_sync_event_id: - await sync_to_async(ExternalSyncEvent.objects.filter(id=request.external_sync_event_id).update)( + await sync_to_async( + ExternalSyncEvent.objects.filter( + id=request.external_sync_event_id + ).update + )( status="ok", error="", ) run = request.codex_run run.status = "approved_waiting_resume" run.error = "" - await sync_to_async(run.save)(update_fields=["status", "error", "updated_at"]) + await sync_to_async(run.save)( + update_fields=["status", "error", "updated_at"] + ) source_service = str(run.source_service or "") source_channel = str(run.source_channel or "") resume_payload = dict(request.resume_payload or {}) @@ -302,14 +358,18 @@ class ClaudeCommandHandler(CommandHandler): provider_payload["source_service"] = source_service provider_payload["source_channel"] = source_channel event_action = resume_action - resume_idempotency_key = str(resume_payload.get("idempotency_key") or "").strip() + resume_idempotency_key = str( + resume_payload.get("idempotency_key") or "" + ).strip() resume_event_key = ( resume_idempotency_key if resume_idempotency_key else f"{self._approval_prefix}:{approval_key}:approved" ) else: - provider_payload = dict(run.request_payload.get("provider_payload") or {}) + provider_payload = dict( + run.request_payload.get("provider_payload") or {} + ) provider_payload.update( { "mode": "approval_response", @@ -337,17 +397,30 @@ class ClaudeCommandHandler(CommandHandler): "error": "", }, ) - return CommandResult(ok=True, status="ok", payload={"approval_key": approval_key, "resolution": "approved"}) + return CommandResult( + ok=True, + status="ok", + payload={"approval_key": approval_key, "resolution": "approved"}, + ) request.status = "denied" request.resolved_at = now request.resolved_by_identifier = current_channel request.resolution_note = "denied via claude command" await sync_to_async(request.save)( - update_fields=["status", "resolved_at", "resolved_by_identifier", "resolution_note"] + update_fields=[ + "status", + "resolved_at", + "resolved_by_identifier", + "resolution_note", + ] ) if request.external_sync_event_id: - await sync_to_async(ExternalSyncEvent.objects.filter(id=request.external_sync_event_id).update)( + await sync_to_async( + ExternalSyncEvent.objects.filter( + id=request.external_sync_event_id + ).update + )( status="failed", error="approval_denied", ) @@ -374,7 +447,11 @@ class ClaudeCommandHandler(CommandHandler): "error": "approval_denied", }, ) - return CommandResult(ok=True, status="ok", payload={"approval_key": approval_key, "resolution": "denied"}) + return CommandResult( + ok=True, + status="ok", + payload={"approval_key": approval_key, "resolution": "denied"}, + ) async def _create_submission( self, @@ -391,7 +468,9 @@ class ClaudeCommandHandler(CommandHandler): ).first() )() if cfg is None: - return CommandResult(ok=False, status="failed", error="provider_disabled_or_missing") + return CommandResult( + ok=False, status="failed", error="provider_disabled_or_missing" + ) service, channel = self._effective_scope(trigger) external_chat_id = await sync_to_async(resolve_external_chat_id)( @@ -418,7 +497,9 @@ class ClaudeCommandHandler(CommandHandler): if mode == "plan": anchor = trigger.reply_to if anchor is None: - return CommandResult(ok=False, status="failed", error="reply_required_for_claude_plan") + return CommandResult( + ok=False, status="failed", error="reply_required_for_claude_plan" + ) rows = await sync_to_async(list)( Message.objects.filter( user=trigger.user, @@ -427,7 +508,9 @@ class ClaudeCommandHandler(CommandHandler): ts__lte=int(trigger.ts or 0), ) .order_by("ts") - .select_related("session", "session__identifier", "session__identifier__person") + .select_related( + "session", "session__identifier", "session__identifier__person" + ) ) payload["reply_context"] = { "anchor_message_id": str(anchor.id), @@ -446,12 +529,18 @@ class ClaudeCommandHandler(CommandHandler): source_channel=channel, external_chat_id=external_chat_id, status="waiting_approval", - request_payload={"action": "append_update", "provider_payload": dict(payload)}, + request_payload={ + "action": "append_update", + "provider_payload": dict(payload), + }, result_payload={}, error="", ) payload["codex_run_id"] = str(run.id) - run.request_payload = {"action": "append_update", "provider_payload": dict(payload)} + run.request_payload = { + "action": "append_update", + "provider_payload": dict(payload), + } await sync_to_async(run.save)(update_fields=["request_payload", "updated_at"]) idempotency_key = f"claude_cmd:{trigger.id}:{mode}:{task.id}:{hashlib.sha1(str(body_text or '').encode('utf-8')).hexdigest()[:12]}" @@ -476,20 +565,26 @@ class ClaudeCommandHandler(CommandHandler): return CommandResult(ok=False, status="failed", error="trigger_not_found") profile = await sync_to_async( - lambda: CommandProfile.objects.filter(user=trigger.user, slug=self.slug, enabled=True).first() + lambda: CommandProfile.objects.filter( + user=trigger.user, slug=self.slug, enabled=True + ).first() )() if profile is None: return CommandResult(ok=False, status="skipped", error="profile_missing") parsed = parse_claude_command(ctx.message_text) if not parsed.command: - return CommandResult(ok=False, status="skipped", error="claude_command_not_matched") + return CommandResult( + ok=False, status="skipped", error="claude_command_not_matched" + ) service, channel = self._effective_scope(trigger) if parsed.command == "status": project = None - reply_task = await self._linked_task_from_reply(trigger.user, trigger.reply_to) + reply_task = await self._linked_task_from_reply( + trigger.user, trigger.reply_to + ) if reply_task is not None: project = reply_task.project return await self._run_status(trigger, service, channel, project) @@ -507,7 +602,9 @@ class ClaudeCommandHandler(CommandHandler): reply_task = await self._linked_task_from_reply(trigger.user, trigger.reply_to) task = await self._resolve_task(trigger.user, reference_code, reply_task) if task is None: - return CommandResult(ok=False, status="failed", error="task_target_required") + return CommandResult( + ok=False, status="failed", error="task_target_required" + ) project, project_error = await self._resolve_project( user=trigger.user, @@ -518,7 +615,9 @@ class ClaudeCommandHandler(CommandHandler): project_token=project_token, ) if project is None: - return CommandResult(ok=False, status="failed", error=project_error or "project_unresolved") + return CommandResult( + ok=False, status="failed", error=project_error or "project_unresolved" + ) mode = "plan" if parsed.command == "plan" else "default" return await self._create_submission( diff --git a/core/commands/handlers/codex.py b/core/commands/handlers/codex.py index 56b21db..89b8746 100644 --- a/core/commands/handlers/codex.py +++ b/core/commands/handlers/codex.py @@ -20,8 +20,8 @@ from core.models import ( TaskProject, TaskProviderConfig, ) -from core.tasks.codex_support import channel_variants, resolve_external_chat_id from core.tasks.codex_approval import queue_codex_event_with_pre_approval +from core.tasks.codex_support import channel_variants, resolve_external_chat_id _CODEX_DEFAULT_RE = re.compile( r"^\s*(?:\.codex\b|#codex#?)(?P.*)$", @@ -31,7 +31,9 @@ _CODEX_PLAN_RE = re.compile( r"^\s*(?:\.codex\s+plan\b|#codex\s+plan#?)(?P.*)$", re.IGNORECASE | re.DOTALL, ) -_CODEX_STATUS_RE = re.compile(r"^\s*(?:\.codex\s+status\b|#codex\s+status#?)\s*$", re.IGNORECASE) +_CODEX_STATUS_RE = re.compile( + r"^\s*(?:\.codex\s+status\b|#codex\s+status#?)\s*$", re.IGNORECASE +) _CODEX_APPROVE_DENY_RE = re.compile( r"^\s*(?:\.codex|#codex)\s+(?Papprove|deny)\s+(?P[A-Za-z0-9._:-]+)#?\s*$", re.IGNORECASE, @@ -55,7 +57,6 @@ class CodexParsedCommand(dict): return str(self.get("approval_key") or "") - def parse_codex_command(text: str) -> CodexParsedCommand: body = str(text or "") m = _CODEX_APPROVE_DENY_RE.match(body) @@ -84,7 +85,9 @@ def parse_codex_command(text: str) -> CodexParsedCommand: return CodexParsedCommand(command=None, body_text="", approval_key="") -def codex_trigger_matches(message_text: str, trigger_token: str, exact_match_only: bool) -> bool: +def codex_trigger_matches( + message_text: str, trigger_token: str, exact_match_only: bool +) -> bool: body = str(message_text or "").strip() parsed = parse_codex_command(body) if parsed.command: @@ -102,7 +105,9 @@ class CodexCommandHandler(CommandHandler): async def _load_trigger(self, message_id: str) -> Message | None: return await sync_to_async( - lambda: Message.objects.select_related("user", "session", "session__identifier", "reply_to") + lambda: Message.objects.select_related( + "user", "session", "session__identifier", "reply_to" + ) .filter(id=message_id) .first() )() @@ -113,11 +118,18 @@ class CodexCommandHandler(CommandHandler): identifier = getattr(getattr(trigger, "session", None), "identifier", None) fallback_service = str(getattr(identifier, "service", "") or "").strip().lower() fallback_identifier = str(getattr(identifier, "identifier", "") or "").strip() - if service == "web" and fallback_service and fallback_identifier and fallback_service != "web": + if ( + service == "web" + and fallback_service + and fallback_identifier + and fallback_service != "web" + ): return fallback_service, fallback_identifier return service or "web", channel - async def _mapped_sources(self, user, service: str, channel: str) -> list[ChatTaskSource]: + async def _mapped_sources( + self, user, service: str, channel: str + ) -> list[ChatTaskSource]: variants = channel_variants(service, channel) if not variants: return [] @@ -130,7 +142,9 @@ class CodexCommandHandler(CommandHandler): ).select_related("project", "epic") ) - async def _linked_task_from_reply(self, user, reply_to: Message | None) -> DerivedTask | None: + async def _linked_task_from_reply( + self, user, reply_to: Message | None + ) -> DerivedTask | None: if reply_to is None: return None by_origin = await sync_to_async( @@ -142,7 +156,9 @@ class CodexCommandHandler(CommandHandler): if by_origin is not None: return by_origin return await sync_to_async( - lambda: DerivedTask.objects.filter(user=user, events__source_message=reply_to) + lambda: DerivedTask.objects.filter( + user=user, events__source_message=reply_to + ) .select_related("project", "epic") .order_by("-created_at") .first() @@ -163,10 +179,14 @@ class CodexCommandHandler(CommandHandler): return "" return str(m.group(1) or "").strip() - async def _resolve_task(self, user, reference_code: str, reply_task: DerivedTask | None) -> DerivedTask | None: + async def _resolve_task( + self, user, reference_code: str, reply_task: DerivedTask | None + ) -> DerivedTask | None: if reference_code: return await sync_to_async( - lambda: DerivedTask.objects.filter(user=user, reference_code=reference_code) + lambda: DerivedTask.objects.filter( + user=user, reference_code=reference_code + ) .select_related("project", "epic") .order_by("-created_at") .first() @@ -189,7 +209,9 @@ class CodexCommandHandler(CommandHandler): return reply_task.project, "" if project_token: project = await sync_to_async( - lambda: TaskProject.objects.filter(user=user, name__iexact=project_token).first() + lambda: TaskProject.objects.filter( + user=user, name__iexact=project_token + ).first() )() if project is not None: return project, "" @@ -198,20 +220,31 @@ class CodexCommandHandler(CommandHandler): mapped = await self._mapped_sources(user, service, channel) project_ids = sorted({str(row.project_id) for row in mapped if row.project_id}) if len(project_ids) == 1: - project = next((row.project for row in mapped if str(row.project_id) == project_ids[0]), None) + project = next( + ( + row.project + for row in mapped + if str(row.project_id) == project_ids[0] + ), + None, + ) return project, "" if len(project_ids) > 1: return None, "project_required:[project:Name]" return None, "project_unresolved" - async def _post_source_status(self, trigger: Message, text: str, suffix: str) -> None: + async def _post_source_status( + self, trigger: Message, text: str, suffix: str + ) -> None: await post_status_in_source( trigger_message=trigger, text=text, origin_tag=f"codex-status:{suffix}", ) - async def _run_status(self, trigger: Message, service: str, channel: str, project: TaskProject | None) -> CommandResult: + async def _run_status( + self, trigger: Message, service: str, channel: str, project: TaskProject | None + ) -> CommandResult: def _load_runs(): qs = CodexRun.objects.filter(user=trigger.user) if service: @@ -224,7 +257,9 @@ class CodexCommandHandler(CommandHandler): runs = await sync_to_async(_load_runs)() if not runs: - await self._post_source_status(trigger, "[codex] no recent runs for this scope.", "empty") + await self._post_source_status( + trigger, "[codex] no recent runs for this scope.", "empty" + ) return CommandResult(ok=True, status="ok", payload={"count": 0}) lines = ["[codex] recent runs:"] for row in runs: @@ -243,27 +278,43 @@ class CodexCommandHandler(CommandHandler): current_channel: str, ) -> CommandResult: cfg = await sync_to_async( - lambda: TaskProviderConfig.objects.filter(user=trigger.user, provider="codex_cli").first() + lambda: TaskProviderConfig.objects.filter( + user=trigger.user, provider="codex_cli" + ).first() )() settings_payload = dict(getattr(cfg, "settings", {}) or {}) - approver_service = str(settings_payload.get("approver_service") or "").strip().lower() - approver_identifier = str(settings_payload.get("approver_identifier") or "").strip() + approver_service = ( + str(settings_payload.get("approver_service") or "").strip().lower() + ) + approver_identifier = str( + settings_payload.get("approver_identifier") or "" + ).strip() if not approver_service or not approver_identifier: - return CommandResult(ok=False, status="failed", error="approver_channel_not_configured") + return CommandResult( + ok=False, status="failed", error="approver_channel_not_configured" + ) - if str(current_service or "").strip().lower() != approver_service or str(current_channel or "").strip() not in set( - channel_variants(approver_service, approver_identifier) - ): - return CommandResult(ok=False, status="failed", error="approval_command_not_allowed_in_this_channel") + if str(current_service or "").strip().lower() != approver_service or str( + current_channel or "" + ).strip() not in set(channel_variants(approver_service, approver_identifier)): + return CommandResult( + ok=False, + status="failed", + error="approval_command_not_allowed_in_this_channel", + ) approval_key = parsed.approval_key request = await sync_to_async( - lambda: CodexPermissionRequest.objects.select_related("codex_run", "external_sync_event") + lambda: CodexPermissionRequest.objects.select_related( + "codex_run", "external_sync_event" + ) .filter(user=trigger.user, approval_key=approval_key) .first() )() if request is None: - return CommandResult(ok=False, status="failed", error="approval_key_not_found") + return CommandResult( + ok=False, status="failed", error="approval_key_not_found" + ) now = timezone.now() if parsed.command == "approve": @@ -280,14 +331,20 @@ class CodexCommandHandler(CommandHandler): ] ) if request.external_sync_event_id: - await sync_to_async(ExternalSyncEvent.objects.filter(id=request.external_sync_event_id).update)( + await sync_to_async( + ExternalSyncEvent.objects.filter( + id=request.external_sync_event_id + ).update + )( status="ok", error="", ) run = request.codex_run run.status = "approved_waiting_resume" run.error = "" - await sync_to_async(run.save)(update_fields=["status", "error", "updated_at"]) + await sync_to_async(run.save)( + update_fields=["status", "error", "updated_at"] + ) source_service = str(run.source_service or "") source_channel = str(run.source_channel or "") resume_payload = dict(request.resume_payload or {}) @@ -299,14 +356,18 @@ class CodexCommandHandler(CommandHandler): provider_payload["source_service"] = source_service provider_payload["source_channel"] = source_channel event_action = resume_action - resume_idempotency_key = str(resume_payload.get("idempotency_key") or "").strip() + resume_idempotency_key = str( + resume_payload.get("idempotency_key") or "" + ).strip() resume_event_key = ( resume_idempotency_key if resume_idempotency_key else f"codex_approval:{approval_key}:approved" ) else: - provider_payload = dict(run.request_payload.get("provider_payload") or {}) + provider_payload = dict( + run.request_payload.get("provider_payload") or {} + ) provider_payload.update( { "mode": "approval_response", @@ -334,17 +395,30 @@ class CodexCommandHandler(CommandHandler): "error": "", }, ) - return CommandResult(ok=True, status="ok", payload={"approval_key": approval_key, "resolution": "approved"}) + return CommandResult( + ok=True, + status="ok", + payload={"approval_key": approval_key, "resolution": "approved"}, + ) request.status = "denied" request.resolved_at = now request.resolved_by_identifier = current_channel request.resolution_note = "denied via command" await sync_to_async(request.save)( - update_fields=["status", "resolved_at", "resolved_by_identifier", "resolution_note"] + update_fields=[ + "status", + "resolved_at", + "resolved_by_identifier", + "resolution_note", + ] ) if request.external_sync_event_id: - await sync_to_async(ExternalSyncEvent.objects.filter(id=request.external_sync_event_id).update)( + await sync_to_async( + ExternalSyncEvent.objects.filter( + id=request.external_sync_event_id + ).update + )( status="failed", error="approval_denied", ) @@ -371,7 +445,11 @@ class CodexCommandHandler(CommandHandler): "error": "approval_denied", }, ) - return CommandResult(ok=True, status="ok", payload={"approval_key": approval_key, "resolution": "denied"}) + return CommandResult( + ok=True, + status="ok", + payload={"approval_key": approval_key, "resolution": "denied"}, + ) async def _create_submission( self, @@ -383,10 +461,14 @@ class CodexCommandHandler(CommandHandler): project: TaskProject, ) -> CommandResult: cfg = await sync_to_async( - lambda: TaskProviderConfig.objects.filter(user=trigger.user, provider="codex_cli", enabled=True).first() + lambda: TaskProviderConfig.objects.filter( + user=trigger.user, provider="codex_cli", enabled=True + ).first() )() if cfg is None: - return CommandResult(ok=False, status="failed", error="provider_disabled_or_missing") + return CommandResult( + ok=False, status="failed", error="provider_disabled_or_missing" + ) service, channel = self._effective_scope(trigger) external_chat_id = await sync_to_async(resolve_external_chat_id)( @@ -413,7 +495,9 @@ class CodexCommandHandler(CommandHandler): if mode == "plan": anchor = trigger.reply_to if anchor is None: - return CommandResult(ok=False, status="failed", error="reply_required_for_codex_plan") + return CommandResult( + ok=False, status="failed", error="reply_required_for_codex_plan" + ) rows = await sync_to_async(list)( Message.objects.filter( user=trigger.user, @@ -422,7 +506,9 @@ class CodexCommandHandler(CommandHandler): ts__lte=int(trigger.ts or 0), ) .order_by("ts") - .select_related("session", "session__identifier", "session__identifier__person") + .select_related( + "session", "session__identifier", "session__identifier__person" + ) ) payload["reply_context"] = { "anchor_message_id": str(anchor.id), @@ -441,12 +527,18 @@ class CodexCommandHandler(CommandHandler): source_channel=channel, external_chat_id=external_chat_id, status="waiting_approval", - request_payload={"action": "append_update", "provider_payload": dict(payload)}, + request_payload={ + "action": "append_update", + "provider_payload": dict(payload), + }, result_payload={}, error="", ) payload["codex_run_id"] = str(run.id) - run.request_payload = {"action": "append_update", "provider_payload": dict(payload)} + run.request_payload = { + "action": "append_update", + "provider_payload": dict(payload), + } await sync_to_async(run.save)(update_fields=["request_payload", "updated_at"]) idempotency_key = f"codex_cmd:{trigger.id}:{mode}:{task.id}:{hashlib.sha1(str(body_text or '').encode('utf-8')).hexdigest()[:12]}" @@ -471,20 +563,26 @@ class CodexCommandHandler(CommandHandler): return CommandResult(ok=False, status="failed", error="trigger_not_found") profile = await sync_to_async( - lambda: CommandProfile.objects.filter(user=trigger.user, slug=self.slug, enabled=True).first() + lambda: CommandProfile.objects.filter( + user=trigger.user, slug=self.slug, enabled=True + ).first() )() if profile is None: return CommandResult(ok=False, status="skipped", error="profile_missing") parsed = parse_codex_command(ctx.message_text) if not parsed.command: - return CommandResult(ok=False, status="skipped", error="codex_command_not_matched") + return CommandResult( + ok=False, status="skipped", error="codex_command_not_matched" + ) service, channel = self._effective_scope(trigger) if parsed.command == "status": project = None - reply_task = await self._linked_task_from_reply(trigger.user, trigger.reply_to) + reply_task = await self._linked_task_from_reply( + trigger.user, trigger.reply_to + ) if reply_task is not None: project = reply_task.project return await self._run_status(trigger, service, channel, project) @@ -502,7 +600,9 @@ class CodexCommandHandler(CommandHandler): reply_task = await self._linked_task_from_reply(trigger.user, trigger.reply_to) task = await self._resolve_task(trigger.user, reference_code, reply_task) if task is None: - return CommandResult(ok=False, status="failed", error="task_target_required") + return CommandResult( + ok=False, status="failed", error="task_target_required" + ) project, project_error = await self._resolve_project( user=trigger.user, @@ -513,7 +613,9 @@ class CodexCommandHandler(CommandHandler): project_token=project_token, ) if project is None: - return CommandResult(ok=False, status="failed", error=project_error or "project_unresolved") + return CommandResult( + ok=False, status="failed", error=project_error or "project_unresolved" + ) mode = "plan" if parsed.command == "plan" else "default" return await self._create_submission( diff --git a/core/commands/policies.py b/core/commands/policies.py index 6d9af9f..028c3cb 100644 --- a/core/commands/policies.py +++ b/core/commands/policies.py @@ -32,7 +32,8 @@ def _legacy_defaults(profile: CommandProfile, post_result_enabled: bool) -> dict "enabled": True, "generation_mode": "ai", "send_plan_to_egress": bool(post_result_enabled), - "send_status_to_source": str(profile.visibility_mode or "") == "status_in_source", + "send_status_to_source": str(profile.visibility_mode or "") + == "status_in_source", "send_status_to_egress": False, "store_document": True, } @@ -56,7 +57,9 @@ def ensure_variant_policies_for_profile( *, action_rows: Iterable[CommandAction] | None = None, ) -> dict[str, CommandVariantPolicy]: - actions = list(action_rows) if action_rows is not None else list(profile.actions.all()) + actions = ( + list(action_rows) if action_rows is not None else list(profile.actions.all()) + ) post_result_enabled = any( row.action_type == "post_result" and bool(row.enabled) for row in actions ) @@ -91,7 +94,9 @@ def ensure_variant_policies_for_profile( return result -def load_variant_policy(profile: CommandProfile, variant_key: str) -> CommandVariantPolicy | None: +def load_variant_policy( + profile: CommandProfile, variant_key: str +) -> CommandVariantPolicy | None: key = str(variant_key or "").strip() if not key: return None diff --git a/core/context_processors.py b/core/context_processors.py index 8871b7b..ce82229 100644 --- a/core/context_processors.py +++ b/core/context_processors.py @@ -27,6 +27,7 @@ def settings_hierarchy_nav(request): ai_models_href = reverse("ai_models") ai_traces_href = reverse("ai_execution_log") commands_href = reverse("command_routing") + business_plans_href = reverse("business_plan_inbox") tasks_href = reverse("tasks_settings") translation_href = reverse("translation_settings") availability_href = reverse("availability_settings") @@ -55,6 +56,8 @@ def settings_hierarchy_nav(request): modules_routes = { "modules_settings", "command_routing", + "business_plan_inbox", + "business_plan_editor", "tasks_settings", "translation_settings", "availability_settings", @@ -106,7 +109,12 @@ def settings_hierarchy_nav(request): "title": "Modules", "tabs": [ _tab("Commands", commands_href, path == commands_href), - _tab("Tasks", tasks_href, path == tasks_href), + _tab( + "Business Plans", + business_plans_href, + url_name in {"business_plan_inbox", "business_plan_editor"}, + ), + _tab("Task Automation", tasks_href, path == tasks_href), _tab("Translation", translation_href, path == translation_href), _tab("Availability", availability_href, path == availability_href), ], diff --git a/core/db/sql.py b/core/db/sql.py index 882e940..b9ee732 100644 --- a/core/db/sql.py +++ b/core/db/sql.py @@ -24,7 +24,6 @@ async def init_mysql_pool(): async def close_mysql_pool(): """Close the MySQL connection pool properly.""" - global mysql_pool if mysql_pool: mysql_pool.close() await mysql_pool.wait_closed() diff --git a/core/events/ledger.py b/core/events/ledger.py index 4253c3a..41957f5 100644 --- a/core/events/ledger.py +++ b/core/events/ledger.py @@ -15,8 +15,12 @@ def event_ledger_enabled() -> bool: def event_ledger_status() -> dict: return { - "event_ledger_dual_write": bool(getattr(settings, "EVENT_LEDGER_DUAL_WRITE", False)), - "event_primary_write_path": bool(getattr(settings, "EVENT_PRIMARY_WRITE_PATH", False)), + "event_ledger_dual_write": bool( + getattr(settings, "EVENT_LEDGER_DUAL_WRITE", False) + ), + "event_primary_write_path": bool( + getattr(settings, "EVENT_PRIMARY_WRITE_PATH", False) + ), } @@ -61,9 +65,7 @@ def append_event_sync( if not normalized_type: raise ValueError("event_type is required") - candidates = { - str(choice[0]) for choice in ConversationEvent.EVENT_TYPE_CHOICES - } + candidates = {str(choice[0]) for choice in ConversationEvent.EVENT_TYPE_CHOICES} if normalized_type not in candidates: raise ValueError(f"unsupported event_type: {normalized_type}") diff --git a/core/events/projection.py b/core/events/projection.py index 9ae951b..8426790 100644 --- a/core/events/projection.py +++ b/core/events/projection.py @@ -90,7 +90,9 @@ def project_session_from_events(session: ChatSession) -> list[dict]: order.append(message_id) state.ts = _safe_int(payload.get("message_ts"), _safe_int(event.ts)) state.text = str(payload.get("text") or state.text or "") - delivered_default = _safe_int(payload.get("delivered_ts"), _safe_int(event.ts)) + delivered_default = _safe_int( + payload.get("delivered_ts"), _safe_int(event.ts) + ) if state.delivered_ts is None: state.delivered_ts = delivered_default or None continue @@ -111,7 +113,11 @@ def project_session_from_events(session: ChatSession) -> list[dict]: continue if event_type in {"reaction_added", "reaction_removed"}: - source_service = str(payload.get("source_service") or event.origin_transport or "").strip().lower() + source_service = ( + str(payload.get("source_service") or event.origin_transport or "") + .strip() + .lower() + ) actor = str(payload.get("actor") or event.actor_identifier or "").strip() emoji = str(payload.get("emoji") or "").strip() if not source_service and not actor and not emoji: @@ -121,7 +127,9 @@ def project_session_from_events(session: ChatSession) -> list[dict]: "source_service": source_service, "actor": actor, "emoji": emoji, - "removed": bool(event_type == "reaction_removed" or payload.get("remove")), + "removed": bool( + event_type == "reaction_removed" or payload.get("remove") + ), } output = [] @@ -135,12 +143,12 @@ def project_session_from_events(session: ChatSession) -> list[dict]: "ts": int(state.ts or 0), "text": str(state.text or ""), "delivered_ts": ( - int(state.delivered_ts) - if state.delivered_ts is not None - else None + int(state.delivered_ts) if state.delivered_ts is not None else None ), "read_ts": int(state.read_ts) if state.read_ts is not None else None, - "reactions": _normalize_reactions(list((state.reactions or {}).values())), + "reactions": _normalize_reactions( + list((state.reactions or {}).values()) + ), } ) return output @@ -182,7 +190,9 @@ def shadow_compare_session(session: ChatSession, detail_limit: int = 50) -> dict cause_samples = {key: [] for key in cause_counts.keys()} cause_sample_limit = min(5, max(0, int(detail_limit))) - def _record_detail(message_id: str, issue: str, cause: str, extra: dict | None = None): + def _record_detail( + message_id: str, issue: str, cause: str, extra: dict | None = None + ): if cause in cause_counts: cause_counts[cause] += 1 row = {"message_id": message_id, "issue": issue, "cause": cause} @@ -224,13 +234,10 @@ def shadow_compare_session(session: ChatSession, detail_limit: int = 50) -> dict db_delivered_ts = db_row.get("delivered_ts") projected_delivered_ts = projected.get("delivered_ts") - if ( - (db_delivered_ts is None) != (projected_delivered_ts is None) - or ( - db_delivered_ts is not None - and projected_delivered_ts is not None - and int(db_delivered_ts) != int(projected_delivered_ts) - ) + if (db_delivered_ts is None) != (projected_delivered_ts is None) or ( + db_delivered_ts is not None + and projected_delivered_ts is not None + and int(db_delivered_ts) != int(projected_delivered_ts) ): counters["delivered_ts_mismatch"] += 1 _record_detail( @@ -245,13 +252,10 @@ def shadow_compare_session(session: ChatSession, detail_limit: int = 50) -> dict db_read_ts = db_row.get("read_ts") projected_read_ts = projected.get("read_ts") - if ( - (db_read_ts is None) != (projected_read_ts is None) - or ( - db_read_ts is not None - and projected_read_ts is not None - and int(db_read_ts) != int(projected_read_ts) - ) + if (db_read_ts is None) != (projected_read_ts is None) or ( + db_read_ts is not None + and projected_read_ts is not None + and int(db_read_ts) != int(projected_read_ts) ): counters["read_ts_mismatch"] += 1 _record_detail( @@ -264,12 +268,19 @@ def shadow_compare_session(session: ChatSession, detail_limit: int = 50) -> dict db_reactions = _normalize_reactions( list((db_row.get("receipt_payload") or {}).get("reactions") or []) ) - projected_reactions = _normalize_reactions(list(projected.get("reactions") or [])) + projected_reactions = _normalize_reactions( + list(projected.get("reactions") or []) + ) if db_reactions != projected_reactions: counters["reactions_mismatch"] += 1 cause = "payload_normalization_gap" strategy = str( - ((db_row.get("receipt_payload") or {}).get("reaction_last_match_strategy") or "") + ( + (db_row.get("receipt_payload") or {}).get( + "reaction_last_match_strategy" + ) + or "" + ) ).strip() if strategy == "nearest_ts_window": cause = "ambiguous_reaction_target" diff --git a/core/forms.py b/core/forms.py index 9fd0446..6a7dbc1 100644 --- a/core/forms.py +++ b/core/forms.py @@ -1,6 +1,7 @@ from django import forms from django.contrib.auth.forms import UserCreationForm from django.forms import ModelForm + from mixins.restrictions import RestrictedFormMixin from .models import ( diff --git a/core/gateway/commands.py b/core/gateway/commands.py index 56d69da..36ca660 100644 --- a/core/gateway/commands.py +++ b/core/gateway/commands.py @@ -8,7 +8,6 @@ from asgiref.sync import sync_to_async from core.models import GatewayCommandEvent from core.security.command_policy import CommandSecurityContext, evaluate_command_policy - GatewayEmit = Callable[[str], None] GatewayHandler = Callable[["GatewayCommandContext", GatewayEmit], Awaitable[bool]] GatewayMatcher = Callable[[str], bool] @@ -103,7 +102,10 @@ async def dispatch_gateway_command( emit(message) event.status = "blocked" event.error = f"{decision.code}:{decision.reason}" - event.response_meta = {"policy_code": decision.code, "policy_reason": decision.reason} + event.response_meta = { + "policy_code": decision.code, + "policy_reason": decision.reason, + } await sync_to_async(event.save)( update_fields=["status", "error", "response_meta", "updated_at"] ) @@ -129,5 +131,7 @@ async def dispatch_gateway_command( event.status = "ok" if handled else "ignored" event.response_meta = {"responses": responses} - await sync_to_async(event.save)(update_fields=["status", "response_meta", "updated_at"]) + await sync_to_async(event.save)( + update_fields=["status", "response_meta", "updated_at"] + ) return bool(handled) diff --git a/core/management/commands/backfill_contact_availability.py b/core/management/commands/backfill_contact_availability.py index b0d2b25..29b72e2 100644 --- a/core/management/commands/backfill_contact_availability.py +++ b/core/management/commands/backfill_contact_availability.py @@ -4,7 +4,7 @@ from typing import Iterable from django.core.management.base import BaseCommand -from core.models import Message, User +from core.models import Message from core.presence import AvailabilitySignal, record_inferred_signal from core.presence.inference import now_ms @@ -19,7 +19,9 @@ class Command(BaseCommand): parser.add_argument("--user-id", default="") parser.add_argument("--dry-run", action="store_true", default=False) - def _iter_messages(self, *, days: int, limit: int, service: str, user_id: str) -> Iterable[Message]: + def _iter_messages( + self, *, days: int, limit: int, service: str, user_id: str + ) -> Iterable[Message]: cutoff_ts = now_ms() - (max(1, int(days)) * 24 * 60 * 60 * 1000) qs = Message.objects.filter(ts__gte=cutoff_ts).select_related( "user", "session", "session__identifier", "session__identifier__person" @@ -40,7 +42,9 @@ class Command(BaseCommand): created = 0 scanned = 0 - for msg in self._iter_messages(days=days, limit=limit, service=service_filter, user_id=user_filter): + for msg in self._iter_messages( + days=days, limit=limit, service=service_filter, user_id=user_filter + ): scanned += 1 identifier = getattr(getattr(msg, "session", None), "identifier", None) person = getattr(identifier, "person", None) @@ -48,12 +52,18 @@ class Command(BaseCommand): if not identifier or not person or not user: continue - service = str(getattr(msg, "source_service", "") or identifier.service or "").strip().lower() + service = ( + str(getattr(msg, "source_service", "") or identifier.service or "") + .strip() + .lower() + ) if not service: continue base_ts = int(getattr(msg, "ts", 0) or 0) - message_author = str(getattr(msg, "custom_author", "") or "").strip().upper() + message_author = ( + str(getattr(msg, "custom_author", "") or "").strip().upper() + ) outgoing = message_author in {"USER", "BOT"} candidates = [] @@ -84,7 +94,9 @@ class Command(BaseCommand): "origin": "backfill_contact_availability", "message_id": str(msg.id), "inferred_from": "read_receipt", - "read_by": str(getattr(msg, "read_by_identifier", "") or ""), + "read_by": str( + getattr(msg, "read_by_identifier", "") or "" + ), }, } ) diff --git a/core/management/commands/codex_worker.py b/core/management/commands/codex_worker.py index 2eebe19..0ffa48c 100644 --- a/core/management/commands/codex_worker.py +++ b/core/management/commands/codex_worker.py @@ -7,7 +7,12 @@ from asgiref.sync import async_to_sync from django.core.management.base import BaseCommand from core.clients.transport import send_message_raw -from core.models import CodexPermissionRequest, CodexRun, ExternalSyncEvent, TaskProviderConfig +from core.models import ( + CodexPermissionRequest, + CodexRun, + ExternalSyncEvent, + TaskProviderConfig, +) from core.tasks.providers import get_provider from core.util import logs @@ -15,7 +20,9 @@ log = logs.get_logger("codex_worker") class Command(BaseCommand): - help = "Process queued external sync events for worker-backed providers (codex_cli)." + help = ( + "Process queued external sync events for worker-backed providers (codex_cli)." + ) def add_arguments(self, parser): parser.add_argument("--once", action="store_true", default=False) @@ -73,7 +80,9 @@ class Command(BaseCommand): payload = dict(event.payload or {}) action = str(payload.get("action") or "append_update").strip().lower() provider_payload = dict(payload.get("provider_payload") or payload) - run_id = str(provider_payload.get("codex_run_id") or payload.get("codex_run_id") or "").strip() + run_id = str( + provider_payload.get("codex_run_id") or payload.get("codex_run_id") or "" + ).strip() codex_run = None if run_id: codex_run = CodexRun.objects.filter(id=run_id, user=event.user).first() @@ -104,9 +113,13 @@ class Command(BaseCommand): result_payload = dict(result.payload or {}) requires_approval = bool(result_payload.get("requires_approval")) if requires_approval: - approval_key = str(result_payload.get("approval_key") or uuid.uuid4().hex[:12]).strip() + approval_key = str( + result_payload.get("approval_key") or uuid.uuid4().hex[:12] + ).strip() permission_request = dict(result_payload.get("permission_request") or {}) - summary = str(result_payload.get("summary") or permission_request.get("summary") or "").strip() + summary = str( + result_payload.get("summary") or permission_request.get("summary") or "" + ).strip() requested_permissions = permission_request.get("requested_permissions") if not isinstance(requested_permissions, (list, dict)): requested_permissions = permission_request or {} @@ -121,28 +134,42 @@ class Command(BaseCommand): codex_run.status = "waiting_approval" codex_run.result_payload = dict(result_payload) codex_run.error = "" - codex_run.save(update_fields=["status", "result_payload", "error", "updated_at"]) + codex_run.save( + update_fields=["status", "result_payload", "error", "updated_at"] + ) CodexPermissionRequest.objects.update_or_create( approval_key=approval_key, defaults={ "user": event.user, - "codex_run": codex_run if codex_run is not None else CodexRun.objects.create( - user=event.user, - task=event.task, - derived_task_event=event.task_event, - source_service=str(provider_payload.get("source_service") or ""), - source_channel=str(provider_payload.get("source_channel") or ""), - external_chat_id=str(provider_payload.get("external_chat_id") or ""), - status="waiting_approval", - request_payload=dict(payload or {}), - result_payload=dict(result_payload), - error="", + "codex_run": ( + codex_run + if codex_run is not None + else CodexRun.objects.create( + user=event.user, + task=event.task, + derived_task_event=event.task_event, + source_service=str( + provider_payload.get("source_service") or "" + ), + source_channel=str( + provider_payload.get("source_channel") or "" + ), + external_chat_id=str( + provider_payload.get("external_chat_id") or "" + ), + status="waiting_approval", + request_payload=dict(payload or {}), + result_payload=dict(result_payload), + error="", + ) ), "external_sync_event": event, "summary": summary, - "requested_permissions": requested_permissions if isinstance(requested_permissions, dict) else { - "items": list(requested_permissions or []) - }, + "requested_permissions": ( + requested_permissions + if isinstance(requested_permissions, dict) + else {"items": list(requested_permissions or [])} + ), "resume_payload": dict(resume_payload or {}), "status": "pending", "resolved_at": None, @@ -150,9 +177,17 @@ class Command(BaseCommand): "resolution_note": "", }, ) - approver_service = str((cfg.settings or {}).get("approver_service") or "").strip().lower() - approver_identifier = str((cfg.settings or {}).get("approver_identifier") or "").strip() - requested_text = result_payload.get("permission_request") or result_payload.get("requested_permissions") or {} + approver_service = ( + str((cfg.settings or {}).get("approver_service") or "").strip().lower() + ) + approver_identifier = str( + (cfg.settings or {}).get("approver_identifier") or "" + ).strip() + requested_text = ( + result_payload.get("permission_request") + or result_payload.get("requested_permissions") + or {} + ) if approver_service and approver_identifier: try: async_to_sync(send_message_raw)( @@ -168,10 +203,17 @@ class Command(BaseCommand): metadata={"origin_tag": f"codex-approval:{approval_key}"}, ) except Exception: - log.exception("failed to notify approver channel for approval_key=%s", approval_key) + log.exception( + "failed to notify approver channel for approval_key=%s", + approval_key, + ) else: - source_service = str(provider_payload.get("source_service") or "").strip().lower() - source_channel = str(provider_payload.get("source_channel") or "").strip() + source_service = ( + str(provider_payload.get("source_service") or "").strip().lower() + ) + source_channel = str( + provider_payload.get("source_channel") or "" + ).strip() if source_service and source_channel: try: async_to_sync(send_message_raw)( @@ -185,7 +227,9 @@ class Command(BaseCommand): metadata={"origin_tag": "codex-approval-missing-target"}, ) except Exception: - log.exception("failed to notify source channel for missing approver target") + log.exception( + "failed to notify source channel for missing approver target" + ) return event.status = "ok" if result.ok else "failed" @@ -201,18 +245,24 @@ class Command(BaseCommand): approval_key = str(provider_payload.get("approval_key") or "").strip() if mode == "approval_response" and approval_key: req = ( - CodexPermissionRequest.objects.select_related("external_sync_event", "codex_run") + CodexPermissionRequest.objects.select_related( + "external_sync_event", "codex_run" + ) .filter(user=event.user, approval_key=approval_key) .first() ) if req and req.external_sync_event_id: if result.ok: - ExternalSyncEvent.objects.filter(id=req.external_sync_event_id).update( + ExternalSyncEvent.objects.filter( + id=req.external_sync_event_id + ).update( status="ok", error="", ) elif str(event.error or "").strip() == "approval_denied": - ExternalSyncEvent.objects.filter(id=req.external_sync_event_id).update( + ExternalSyncEvent.objects.filter( + id=req.external_sync_event_id + ).update( status="failed", error="approval_denied", ) @@ -220,9 +270,16 @@ class Command(BaseCommand): codex_run.status = "ok" if result.ok else "failed" codex_run.error = str(result.error or "") codex_run.result_payload = result_payload - codex_run.save(update_fields=["status", "error", "result_payload", "updated_at"]) + codex_run.save( + update_fields=["status", "error", "result_payload", "updated_at"] + ) - if result.ok and result.external_key and event.task_id and not str(event.task.external_key or "").strip(): + if ( + result.ok + and result.external_key + and event.task_id + and not str(event.task.external_key or "").strip() + ): event.task.external_key = str(result.external_key) event.task.save(update_fields=["external_key"]) @@ -250,7 +307,11 @@ class Command(BaseCommand): continue for row_id in claimed_ids: - event = ExternalSyncEvent.objects.filter(id=row_id).select_related("task", "user").first() + event = ( + ExternalSyncEvent.objects.filter(id=row_id) + .select_related("task", "user") + .first() + ) if event is None: continue try: diff --git a/core/management/commands/event_projection_shadow.py b/core/management/commands/event_projection_shadow.py index 3be8861..1a863d8 100644 --- a/core/management/commands/event_projection_shadow.py +++ b/core/management/commands/event_projection_shadow.py @@ -85,7 +85,9 @@ class Command(BaseCommand): compared = shadow_compare_session(session, detail_limit=detail_limit) aggregate["sessions_scanned"] += 1 aggregate["db_message_count"] += int(compared.get("db_message_count") or 0) - aggregate["projected_message_count"] += int(compared.get("projected_message_count") or 0) + aggregate["projected_message_count"] += int( + compared.get("projected_message_count") or 0 + ) aggregate["mismatch_total"] += int(compared.get("mismatch_total") or 0) for key in aggregate["counters"].keys(): aggregate["counters"][key] += int( diff --git a/core/management/commands/recalculate_contact_availability.py b/core/management/commands/recalculate_contact_availability.py index 03d358f..1c2e667 100644 --- a/core/management/commands/recalculate_contact_availability.py +++ b/core/management/commands/recalculate_contact_availability.py @@ -1,14 +1,11 @@ from __future__ import annotations -from collections import defaultdict - from django.core.management.base import BaseCommand from core.models import ContactAvailabilityEvent, ContactAvailabilitySpan, Message from core.presence import AvailabilitySignal, record_native_signal from core.presence.inference import now_ms - _SOURCE_ORDER = { "message_in": 10, "message_out": 20, @@ -51,9 +48,14 @@ class Command(BaseCommand): if not identifier or not person or not user: continue - service = str( - getattr(msg, "source_service", "") or getattr(identifier, "service", "") - ).strip().lower() + service = ( + str( + getattr(msg, "source_service", "") + or getattr(identifier, "service", "") + ) + .strip() + .lower() + ) if not service: continue @@ -95,12 +97,16 @@ class Command(BaseCommand): "origin": "recalculate_contact_availability", "message_id": str(msg.id), "inferred_from": "read_receipt", - "read_by": str(getattr(msg, "read_by_identifier", "") or ""), + "read_by": str( + getattr(msg, "read_by_identifier", "") or "" + ), }, } ) - reactions = list((getattr(msg, "receipt_payload", {}) or {}).get("reactions") or []) + reactions = list( + (getattr(msg, "receipt_payload", {}) or {}).get("reactions") or [] + ) for reaction in reactions: item = dict(reaction or {}) if bool(item.get("removed")): @@ -124,7 +130,9 @@ class Command(BaseCommand): "inferred_from": "reaction", "emoji": str(item.get("emoji") or ""), "actor": str(item.get("actor") or ""), - "source_service": str(item.get("source_service") or service), + "source_service": str( + item.get("source_service") or service + ), }, } ) diff --git a/core/management/commands/reconcile_workspace_metric_history.py b/core/management/commands/reconcile_workspace_metric_history.py index 45227fa..37540c9 100644 --- a/core/management/commands/reconcile_workspace_metric_history.py +++ b/core/management/commands/reconcile_workspace_metric_history.py @@ -67,7 +67,9 @@ def _compute_payload(rows, identifier_values): pending_out_ts = None first_ts = int(rows[0]["ts"] or 0) last_ts = int(rows[-1]["ts"] or 0) - latest_service = str(rows[-1].get("session__identifier__service") or "").strip().lower() + latest_service = ( + str(rows[-1].get("session__identifier__service") or "").strip().lower() + ) for row in rows: ts = int(row.get("ts") or 0) @@ -162,18 +164,18 @@ def _compute_payload(rows, identifier_values): payload = { "source_event_ts": last_ts, "stability_state": stability_state, - "stability_score": float(stability_score_value) - if stability_score_value is not None - else None, + "stability_score": ( + float(stability_score_value) if stability_score_value is not None else None + ), "stability_confidence": round(confidence, 3), "stability_sample_messages": message_count, "stability_sample_days": sample_days, - "commitment_inbound_score": float(commitment_in_value) - if commitment_in_value is not None - else None, - "commitment_outbound_score": float(commitment_out_value) - if commitment_out_value is not None - else None, + "commitment_inbound_score": ( + float(commitment_in_value) if commitment_in_value is not None else None + ), + "commitment_outbound_score": ( + float(commitment_out_value) if commitment_out_value is not None else None + ), "commitment_confidence": round(confidence, 3), "inbound_messages": inbound_count, "outbound_messages": outbound_count, @@ -232,15 +234,17 @@ class Command(BaseCommand): dry_run = bool(options.get("dry_run")) reset = not bool(options.get("no_reset")) compact_enabled = not bool(options.get("skip_compact")) - today_start = dj_timezone.now().astimezone(timezone.utc).replace( - hour=0, - minute=0, - second=0, - microsecond=0, - ) - cutoff_ts = int( - (today_start.timestamp() * 1000) - (days * 24 * 60 * 60 * 1000) + today_start = ( + dj_timezone.now() + .astimezone(timezone.utc) + .replace( + hour=0, + minute=0, + second=0, + microsecond=0, + ) ) + cutoff_ts = int((today_start.timestamp() * 1000) - (days * 24 * 60 * 60 * 1000)) people_qs = Person.objects.all() if user_id: @@ -256,14 +260,18 @@ class Command(BaseCommand): compacted_deleted = 0 for person in people: - identifiers_qs = PersonIdentifier.objects.filter(user=person.user, person=person) + identifiers_qs = PersonIdentifier.objects.filter( + user=person.user, person=person + ) if service: identifiers_qs = identifiers_qs.filter(service=service) identifiers = list(identifiers_qs) if not identifiers: continue identifier_values = { - str(row.identifier or "").strip() for row in identifiers if row.identifier + str(row.identifier or "").strip() + for row in identifiers + if row.identifier } if not identifier_values: continue @@ -350,7 +358,9 @@ class Command(BaseCommand): snapshots_created += 1 if dry_run: continue - WorkspaceMetricSnapshot.objects.create(conversation=conversation, **payload) + WorkspaceMetricSnapshot.objects.create( + conversation=conversation, **payload + ) existing_signatures.add(signature) if not latest_payload: @@ -368,7 +378,9 @@ class Command(BaseCommand): "updated_at": dj_timezone.now().isoformat(), } if not dry_run: - conversation.platform_type = latest_service or conversation.platform_type + conversation.platform_type = ( + latest_service or conversation.platform_type + ) conversation.last_event_ts = latest_payload.get("source_event_ts") conversation.stability_state = str( latest_payload.get("stability_state") @@ -416,7 +428,9 @@ class Command(BaseCommand): ) if compact_enabled: snapshot_rows = list( - WorkspaceMetricSnapshot.objects.filter(conversation=conversation) + WorkspaceMetricSnapshot.objects.filter( + conversation=conversation + ) .order_by("computed_at", "id") .values("id", "computed_at", "source_event_ts") ) @@ -428,7 +442,9 @@ class Command(BaseCommand): ) if keep_ids: compacted_deleted += ( - WorkspaceMetricSnapshot.objects.filter(conversation=conversation) + WorkspaceMetricSnapshot.objects.filter( + conversation=conversation + ) .exclude(id__in=list(keep_ids)) .delete()[0] ) diff --git a/core/management/commands/task_sync_worker.py b/core/management/commands/task_sync_worker.py index df48011..dcfe443 100644 --- a/core/management/commands/task_sync_worker.py +++ b/core/management/commands/task_sync_worker.py @@ -4,4 +4,6 @@ from core.management.commands.codex_worker import Command as LegacyCodexWorkerCo class Command(LegacyCodexWorkerCommand): - help = "Process queued task-sync events for worker-backed providers (Codex + Claude)." + help = ( + "Process queued task-sync events for worker-backed providers (Codex + Claude)." + ) diff --git a/core/mcp/server.py b/core/mcp/server.py index 903198b..dc92c05 100644 --- a/core/mcp/server.py +++ b/core/mcp/server.py @@ -123,7 +123,9 @@ def _handle_message(message: dict[str, Any]) -> dict[str, Any] | None: msg_id, { "isError": True, - "content": [{"type": "text", "text": json.dumps({"error": str(exc)})}], + "content": [ + {"type": "text", "text": json.dumps({"error": str(exc)})} + ], }, ) diff --git a/core/mcp/tools.py b/core/mcp/tools.py index 54973cf..317a58a 100644 --- a/core/mcp/tools.py +++ b/core/mcp/tools.py @@ -216,7 +216,9 @@ def _next_unique_slug(*, user_id: int, requested_slug: str) -> str: raise ValueError("slug cannot be empty") candidate = base idx = 2 - while KnowledgeArticle.objects.filter(user_id=int(user_id), slug=candidate).exists(): + while KnowledgeArticle.objects.filter( + user_id=int(user_id), slug=candidate + ).exists(): suffix = f"-{idx}" candidate = f"{base[: max(1, 255 - len(suffix))]}{suffix}" idx += 1 @@ -645,9 +647,7 @@ def tool_wiki_update_article(arguments: dict[str, Any]) -> dict[str, Any]: ) if status_marker and status == "archived" and article.status != "archived": if not approve_archive: - raise ValueError( - "approve_archive=true is required to archive an article" - ) + raise ValueError("approve_archive=true is required to archive an article") if title: article.title = title @@ -705,7 +705,9 @@ def tool_wiki_list(arguments: dict[str, Any]) -> dict[str, Any]: def tool_wiki_get(arguments: dict[str, Any]) -> dict[str, Any]: article = _get_article_for_user(arguments) include_revisions = bool(arguments.get("include_revisions")) - revision_limit = _safe_limit(arguments.get("revision_limit"), default=20, low=1, high=200) + revision_limit = _safe_limit( + arguments.get("revision_limit"), default=20, low=1, high=200 + ) payload = {"article": _article_payload(article)} if include_revisions: revisions = article.revisions.order_by("-revision")[:revision_limit] @@ -714,7 +716,9 @@ def tool_wiki_get(arguments: dict[str, Any]) -> dict[str, Any]: def tool_project_get_guidelines(arguments: dict[str, Any]) -> dict[str, Any]: - max_chars = _safe_limit(arguments.get("max_chars"), default=16000, low=500, high=50000) + max_chars = _safe_limit( + arguments.get("max_chars"), default=16000, low=500, high=50000 + ) base = Path(settings.BASE_DIR).resolve() file_names = ["AGENTS.md", "LLM_CODING_STANDARDS.md", "INSTALL.md", "README.md"] payload = [] @@ -734,7 +738,9 @@ def tool_project_get_guidelines(arguments: dict[str, Any]) -> dict[str, Any]: def tool_project_get_layout(arguments: dict[str, Any]) -> dict[str, Any]: - max_entries = _safe_limit(arguments.get("max_entries"), default=300, low=50, high=4000) + max_entries = _safe_limit( + arguments.get("max_entries"), default=300, low=50, high=4000 + ) base = Path(settings.BASE_DIR).resolve() roots = ["app", "core", "scripts", "utilities", "artifacts"] items: list[str] = [] @@ -754,7 +760,9 @@ def tool_project_get_layout(arguments: dict[str, Any]) -> dict[str, Any]: def tool_project_get_runbook(arguments: dict[str, Any]) -> dict[str, Any]: - max_chars = _safe_limit(arguments.get("max_chars"), default=16000, low=500, high=50000) + max_chars = _safe_limit( + arguments.get("max_chars"), default=16000, low=500, high=50000 + ) base = Path(settings.BASE_DIR).resolve() file_names = [ "INSTALL.md", @@ -792,7 +800,11 @@ def tool_docs_append_run_note(arguments: dict[str, Any]) -> dict[str, Any]: path = Path("/tmp/gia-mcp-run-notes.md") else: candidate = Path(raw_path) - path = candidate.resolve() if candidate.is_absolute() else (base / candidate).resolve() + path = ( + candidate.resolve() + if candidate.is_absolute() + else (base / candidate).resolve() + ) allowed_roots = [base, Path("/tmp").resolve()] if not any(str(path).startswith(str(root)) for root in allowed_roots): raise ValueError("path must be within project root or /tmp") @@ -812,7 +824,11 @@ def tool_docs_append_run_note(arguments: dict[str, Any]) -> dict[str, Any]: TOOL_DEFS: dict[str, dict[str, Any]] = { "manticore.status": { "description": "Report configured memory backend status (django or manticore).", - "inputSchema": {"type": "object", "properties": {}, "additionalProperties": False}, + "inputSchema": { + "type": "object", + "properties": {}, + "additionalProperties": False, + }, "handler": tool_manticore_status, }, "manticore.query": { diff --git a/core/memory/__init__.py b/core/memory/__init__.py index e4f2781..4897c75 100644 --- a/core/memory/__init__.py +++ b/core/memory/__init__.py @@ -1,4 +1,4 @@ -from .search_backend import get_memory_search_backend from .retrieval import retrieve_memories_for_prompt +from .search_backend import get_memory_search_backend __all__ = ["get_memory_search_backend", "retrieve_memories_for_prompt"] diff --git a/core/memory/pipeline.py b/core/memory/pipeline.py index b0b2c3b..2624aba 100644 --- a/core/memory/pipeline.py +++ b/core/memory/pipeline.py @@ -224,7 +224,9 @@ def create_memory_change_request( person_id=person_id or (str(memory.person_id or "") if memory else "") or None, action=normalized_action, status="pending", - proposed_memory_kind=str(memory_kind or (memory.memory_kind if memory else "")).strip(), + proposed_memory_kind=str( + memory_kind or (memory.memory_kind if memory else "") + ).strip(), proposed_content=dict(content or {}), proposed_confidence_score=( float(confidence_score) @@ -335,7 +337,9 @@ def review_memory_change_request( @transaction.atomic -def run_memory_hygiene(*, user_id: int | None = None, dry_run: bool = False) -> dict[str, int]: +def run_memory_hygiene( + *, user_id: int | None = None, dry_run: bool = False +) -> dict[str, int]: now = timezone.now() queryset = MemoryItem.objects.filter(status="active") if user_id is not None: @@ -357,7 +361,9 @@ def run_memory_hygiene(*, user_id: int | None = None, dry_run: bool = False) -> for item in queryset.select_related("conversation", "person"): content = item.content or {} field = str(content.get("field") or content.get("key") or "").strip().lower() - text = _clean_value(str(content.get("text") or content.get("value") or "")).lower() + text = _clean_value( + str(content.get("text") or content.get("value") or "") + ).lower() if not field or not text: continue scope = ( diff --git a/core/memory/retrieval.py b/core/memory/retrieval.py index 8f19d86..31e192d 100644 --- a/core/memory/retrieval.py +++ b/core/memory/retrieval.py @@ -59,7 +59,11 @@ def retrieve_memories_for_prompt( limit=safe_limit, include_statuses=statuses, ) - ids = [str(hit.memory_id or "").strip() for hit in hits if str(hit.memory_id or "").strip()] + ids = [ + str(hit.memory_id or "").strip() + for hit in hits + if str(hit.memory_id or "").strip() + ] scoped = _base_queryset( user_id=int(user_id), person_id=person_id, @@ -82,11 +86,17 @@ def retrieve_memories_for_prompt( "content": item.content or {}, "provenance": item.provenance or {}, "confidence_score": float(item.confidence_score or 0.0), - "expires_at": item.expires_at.isoformat() if item.expires_at else "", - "last_verified_at": ( - item.last_verified_at.isoformat() if item.last_verified_at else "" + "expires_at": ( + item.expires_at.isoformat() if item.expires_at else "" + ), + "last_verified_at": ( + item.last_verified_at.isoformat() + if item.last_verified_at + else "" + ), + "updated_at": ( + item.updated_at.isoformat() if item.updated_at else "" ), - "updated_at": item.updated_at.isoformat() if item.updated_at else "", "search_score": float(hit.score or 0.0), "search_summary": str(hit.summary or ""), } diff --git a/core/memory/search_backend.py b/core/memory/search_backend.py index 5f34ac1..1732dda 100644 --- a/core/memory/search_backend.py +++ b/core/memory/search_backend.py @@ -1,7 +1,6 @@ from __future__ import annotations import hashlib -import json import time from dataclasses import dataclass from typing import Any @@ -144,9 +143,10 @@ class ManticoreMemorySearchBackend(BaseMemorySearchBackend): self.base_url = str( getattr(settings, "MANTICORE_HTTP_URL", "http://localhost:9308") ).rstrip("/") - self.table = str( - getattr(settings, "MANTICORE_MEMORY_TABLE", "gia_memory_items") - ).strip() or "gia_memory_items" + self.table = ( + str(getattr(settings, "MANTICORE_MEMORY_TABLE", "gia_memory_items")).strip() + or "gia_memory_items" + ) self.timeout_seconds = int(getattr(settings, "MANTICORE_HTTP_TIMEOUT", 5) or 5) self._table_cache_key = f"{self.base_url}|{self.table}" @@ -163,7 +163,9 @@ class ManticoreMemorySearchBackend(BaseMemorySearchBackend): return dict(payload or {}) def ensure_table(self) -> None: - last_ready = float(self._table_ready_cache.get(self._table_cache_key, 0.0) or 0.0) + last_ready = float( + self._table_ready_cache.get(self._table_cache_key, 0.0) or 0.0 + ) if (time.time() - last_ready) <= float(self._table_ready_ttl_seconds): return self._sql( @@ -254,7 +256,9 @@ class ManticoreMemorySearchBackend(BaseMemorySearchBackend): try: values.append(self._build_upsert_values_clause(item)) except Exception as exc: - log.warning("memory-search upsert build failed id=%s err=%s", item.id, exc) + log.warning( + "memory-search upsert build failed id=%s err=%s", item.id, exc + ) continue if len(values) >= batch_size: self._sql( @@ -290,7 +294,11 @@ class ManticoreMemorySearchBackend(BaseMemorySearchBackend): where_parts = [f"user_id={int(user_id)}", f"MATCH('{self._escape(needle)}')"] if conversation_id: where_parts.append(f"conversation_id='{self._escape(conversation_id)}'") - statuses = [str(item or "").strip() for item in include_statuses if str(item or "").strip()] + statuses = [ + str(item or "").strip() + for item in include_statuses + if str(item or "").strip() + ] if statuses: in_clause = ",".join(f"'{self._escape(item)}'" for item in statuses) where_parts.append(f"status IN ({in_clause})") diff --git a/core/messaging/history.py b/core/messaging/history.py index e1906e3..fd5ad55 100644 --- a/core/messaging/history.py +++ b/core/messaging/history.py @@ -1,12 +1,13 @@ -from asgiref.sync import sync_to_async -from django.conf import settings import time import uuid +from asgiref.sync import sync_to_async +from django.conf import settings + from core.events.ledger import append_event from core.messaging.utils import messages_to_string -from core.observability.tracing import ensure_trace_id from core.models import ChatSession, Message, QueuedMessage +from core.observability.tracing import ensure_trace_id from core.util import logs log = logs.get_logger("history") @@ -272,7 +273,9 @@ async def store_own_message( trace_id=ensure_trace_id(trace_id, message_meta or {}), ) except Exception as exc: - log.warning("Event ledger append failed for own message=%s: %s", msg.id, exc) + log.warning( + "Event ledger append failed for own message=%s: %s", msg.id, exc + ) return msg diff --git a/core/messaging/reply_sync.py b/core/messaging/reply_sync.py index 99473fe..98e3215 100644 --- a/core/messaging/reply_sync.py +++ b/core/messaging/reply_sync.py @@ -335,8 +335,12 @@ def extract_reply_ref(service: str, raw_payload: dict[str, Any]) -> dict[str, st svc = _clean(service).lower() payload = _as_dict(raw_payload) if svc == "xmpp": - reply_id = _clean(payload.get("reply_source_message_id") or payload.get("reply_id")) - reply_chat = _clean(payload.get("reply_source_chat_id") or payload.get("reply_chat_id")) + reply_id = _clean( + payload.get("reply_source_message_id") or payload.get("reply_id") + ) + reply_chat = _clean( + payload.get("reply_source_chat_id") or payload.get("reply_chat_id") + ) if reply_id: return { "reply_source_message_id": reply_id, @@ -363,7 +367,9 @@ def extract_origin_tag(raw_payload: dict[str, Any] | None) -> str: return _find_origin_tag(_as_dict(raw_payload)) -async def resolve_reply_target(user, session, reply_ref: dict[str, str]) -> Message | None: +async def resolve_reply_target( + user, session, reply_ref: dict[str, str] +) -> Message | None: if not reply_ref or session is None: return None reply_source_message_id = _clean(reply_ref.get("reply_source_message_id")) diff --git a/core/migrations/0029_answermemory_answersuggestionevent_chattasksource_and_more.py b/core/migrations/0029_answermemory_answersuggestionevent_chattasksource_and_more.py index e38ae5e..46cd34d 100644 --- a/core/migrations/0029_answermemory_answersuggestionevent_chattasksource_and_more.py +++ b/core/migrations/0029_answermemory_answersuggestionevent_chattasksource_and_more.py @@ -1,7 +1,8 @@ # Generated by Django 5.2.11 on 2026-03-02 11:55 -import django.db.models.deletion import uuid + +import django.db.models.deletion from django.conf import settings from django.db import migrations, models diff --git a/core/migrations/0033_contactavailability_and_externalchatlink.py b/core/migrations/0033_contactavailability_and_externalchatlink.py index 93eefc1..aeb5dc0 100644 --- a/core/migrations/0033_contactavailability_and_externalchatlink.py +++ b/core/migrations/0033_contactavailability_and_externalchatlink.py @@ -1,6 +1,6 @@ +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): diff --git a/core/migrations/0034_codexrun_codexpermissionrequest_and_more.py b/core/migrations/0034_codexrun_codexpermissionrequest_and_more.py index 49c74aa..a242da2 100644 --- a/core/migrations/0034_codexrun_codexpermissionrequest_and_more.py +++ b/core/migrations/0034_codexrun_codexpermissionrequest_and_more.py @@ -1,8 +1,8 @@ import uuid +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): diff --git a/core/migrations/0035_conversationevent_adapterhealthevent.py b/core/migrations/0035_conversationevent_adapterhealthevent.py index 1ed6429..a393676 100644 --- a/core/migrations/0035_conversationevent_adapterhealthevent.py +++ b/core/migrations/0035_conversationevent_adapterhealthevent.py @@ -1,8 +1,8 @@ import uuid +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): diff --git a/core/migrations/0040_commandsecuritypolicy_gatewaycommandevent.py b/core/migrations/0040_commandsecuritypolicy_gatewaycommandevent.py index a0b273f..9da74e7 100644 --- a/core/migrations/0040_commandsecuritypolicy_gatewaycommandevent.py +++ b/core/migrations/0040_commandsecuritypolicy_gatewaycommandevent.py @@ -1,8 +1,8 @@ # Generated by Django 4.2.19 on 2026-03-07 00:00 +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): diff --git a/core/migrations/0042_userxmppomemotrustedkey_and_more.py b/core/migrations/0042_userxmppomemotrustedkey_and_more.py new file mode 100644 index 0000000..4d80b18 --- /dev/null +++ b/core/migrations/0042_userxmppomemotrustedkey_and_more.py @@ -0,0 +1,39 @@ +# Generated by Django 5.2.7 on 2026-03-07 20:12 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0041_useraccessibilitysettings'), + ] + + operations = [ + migrations.CreateModel( + name='UserXmppOmemoTrustedKey', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('jid', models.CharField(blank=True, default='', max_length=255)), + ('key_type', models.CharField(choices=[('fingerprint', 'Fingerprint'), ('client_key', 'Client key')], default='fingerprint', max_length=32)), + ('key_id', models.CharField(max_length=255)), + ('trusted', models.BooleanField(default=False)), + ('source', models.CharField(blank=True, default='', max_length=64)), + ('last_seen_at', models.DateTimeField(blank=True, null=True)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='xmpp_omemo_trusted_keys', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'indexes': [ + models.Index(fields=['user', 'trusted', 'updated_at'], name='core_userxomemo_trusted_idx'), + models.Index(fields=['user', 'jid', 'updated_at'], name='core_userxomemo_jid_idx'), + ], + 'constraints': [ + models.UniqueConstraint(fields=('user', 'jid', 'key_type', 'key_id'), name='unique_user_xmpp_omemo_trusted_key'), + ], + }, + ), + ] diff --git a/core/migrations/0043_userxmppsecuritysettings_encrypt_contact_messages_with_omemo.py b/core/migrations/0043_userxmppsecuritysettings_encrypt_contact_messages_with_omemo.py new file mode 100644 index 0000000..3b1c11a --- /dev/null +++ b/core/migrations/0043_userxmppsecuritysettings_encrypt_contact_messages_with_omemo.py @@ -0,0 +1,18 @@ +# Generated by Django 5.2.7 on 2026-03-07 20:23 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("core", "0042_userxmppomemotrustedkey_and_more"), + ] + + operations = [ + migrations.AddField( + model_name="userxmppsecuritysettings", + name="encrypt_contact_messages_with_omemo", + field=models.BooleanField(default=True), + ), + ] diff --git a/core/models.py b/core/models.py index 8ba8a4f..e8672c9 100644 --- a/core/models.py +++ b/core/models.py @@ -20,14 +20,14 @@ SERVICE_CHOICES = ( ) CHANNEL_SERVICE_CHOICES = SERVICE_CHOICES + (("web", "Web"),) MBTI_CHOICES = ( - ("INTJ", "INTJ - Architect"),# ;) + ("INTJ", "INTJ - Architect"), # ;) ("INTP", "INTP - Logician"), ("ENTJ", "ENTJ - Commander"), ("ENTP", "ENTP - Debater"), ("INFJ", "INFJ - Advocate"), ("INFP", "INFP - Mediator"), ("ENFJ", "ENFJ - Protagonist"), - ("ENFP", "ENFP - Campaigner"), # <3 + ("ENFP", "ENFP - Campaigner"), # <3 ("ISTJ", "ISTJ - Logistician"), ("ISFJ", "ISFJ - Defender"), ("ESTJ", "ESTJ - Executive"), @@ -241,17 +241,13 @@ class PlatformChatLink(models.Model): raise ValidationError("Person must belong to the same user.") if self.person_identifier_id: if self.person_identifier.user_id != self.user_id: - raise ValidationError( - "Person identifier must belong to the same user." - ) + raise ValidationError("Person identifier must belong to the same user.") if self.person_identifier.person_id != self.person_id: raise ValidationError( "Person identifier must belong to the selected person." ) if self.person_identifier.service != self.service: - raise ValidationError( - "Chat links cannot be linked across platforms." - ) + raise ValidationError("Chat links cannot be linked across platforms.") def save(self, *args, **kwargs): value = str(self.chat_identifier or "").strip() @@ -1869,9 +1865,7 @@ class PatternArtifactExport(models.Model): class CommandProfile(models.Model): - WINDOW_SCOPE_CHOICES = ( - ("conversation", "Conversation"), - ) + WINDOW_SCOPE_CHOICES = (("conversation", "Conversation"),) VISIBILITY_CHOICES = ( ("status_in_source", "Status In Source"), ("silent", "Silent"), @@ -2039,7 +2033,9 @@ class BusinessPlanDocument(models.Model): class Meta: indexes = [ models.Index(fields=["user", "status", "updated_at"]), - models.Index(fields=["user", "source_service", "source_channel_identifier"]), + models.Index( + fields=["user", "source_service", "source_channel_identifier"] + ), ] @@ -2243,7 +2239,9 @@ class TranslationEventLog(models.Model): class AnswerMemory(models.Model): id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) - user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="answer_memory") + user = models.ForeignKey( + User, on_delete=models.CASCADE, related_name="answer_memory" + ) service = models.CharField(max_length=255, choices=CHANNEL_SERVICE_CHOICES) channel_identifier = models.CharField(max_length=255) question_fingerprint = models.CharField(max_length=128) @@ -2261,7 +2259,9 @@ class AnswerMemory(models.Model): class Meta: indexes = [ - models.Index(fields=["user", "service", "channel_identifier", "created_at"]), + models.Index( + fields=["user", "service", "channel_identifier", "created_at"] + ), models.Index(fields=["user", "question_fingerprint", "created_at"]), ] @@ -2284,7 +2284,9 @@ class AnswerSuggestionEvent(models.Model): on_delete=models.CASCADE, related_name="answer_suggestion_events", ) - status = models.CharField(max_length=32, choices=STATUS_CHOICES, default="suggested") + status = models.CharField( + max_length=32, choices=STATUS_CHOICES, default="suggested" + ) candidate_answer = models.ForeignKey( AnswerMemory, on_delete=models.SET_NULL, @@ -2305,7 +2307,9 @@ class AnswerSuggestionEvent(models.Model): class TaskProject(models.Model): id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) - user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="task_projects") + user = models.ForeignKey( + User, on_delete=models.CASCADE, related_name="task_projects" + ) name = models.CharField(max_length=255) external_key = models.CharField(max_length=255, blank=True, default="") active = models.BooleanField(default=True) @@ -2349,7 +2353,9 @@ class TaskEpic(models.Model): class ChatTaskSource(models.Model): id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) - user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="chat_task_sources") + user = models.ForeignKey( + User, on_delete=models.CASCADE, related_name="chat_task_sources" + ) service = models.CharField(max_length=255, choices=CHANNEL_SERVICE_CHOICES) channel_identifier = models.CharField(max_length=255) project = models.ForeignKey( @@ -2378,7 +2384,9 @@ class ChatTaskSource(models.Model): class DerivedTask(models.Model): id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) - user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="derived_tasks") + user = models.ForeignKey( + User, on_delete=models.CASCADE, related_name="derived_tasks" + ) project = models.ForeignKey( TaskProject, on_delete=models.CASCADE, @@ -2574,7 +2582,9 @@ class ExternalSyncEvent(models.Model): ) id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) - user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="external_sync_events") + user = models.ForeignKey( + User, on_delete=models.CASCADE, related_name="external_sync_events" + ) task = models.ForeignKey( DerivedTask, on_delete=models.SET_NULL, @@ -2606,7 +2616,9 @@ class ExternalSyncEvent(models.Model): class TaskProviderConfig(models.Model): id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) - user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="task_provider_configs") + user = models.ForeignKey( + User, on_delete=models.CASCADE, related_name="task_provider_configs" + ) provider = models.CharField(max_length=64, default="mock") enabled = models.BooleanField(default=False) settings = models.JSONField(default=dict, blank=True) @@ -2684,7 +2696,9 @@ class CodexRun(models.Model): class Meta: indexes = [ models.Index(fields=["user", "status", "updated_at"]), - models.Index(fields=["user", "source_service", "source_channel", "created_at"]), + models.Index( + fields=["user", "source_service", "source_channel", "created_at"] + ), ] @@ -2697,7 +2711,9 @@ class CodexPermissionRequest(models.Model): ) id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) - user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="codex_permission_requests") + user = models.ForeignKey( + User, on_delete=models.CASCADE, related_name="codex_permission_requests" + ) codex_run = models.ForeignKey( CodexRun, on_delete=models.CASCADE, @@ -2910,7 +2926,49 @@ class UserXmppOmemoState(models.Model): class Meta: indexes = [ - models.Index(fields=["status", "updated_at"], name="core_userxm_status_133ead_idx"), + models.Index( + fields=["status", "updated_at"], name="core_userxm_status_133ead_idx" + ), + ] + + +class UserXmppOmemoTrustedKey(models.Model): + KEY_TYPE_CHOICES = ( + ("fingerprint", "Fingerprint"), + ("client_key", "Client key"), + ) + + user = models.ForeignKey( + User, + on_delete=models.CASCADE, + related_name="xmpp_omemo_trusted_keys", + ) + jid = models.CharField(max_length=255, blank=True, default="") + key_type = models.CharField( + max_length=32, choices=KEY_TYPE_CHOICES, default="fingerprint" + ) + key_id = models.CharField(max_length=255) + trusted = models.BooleanField(default=False) + source = models.CharField(max_length=64, blank=True, default="") + last_seen_at = models.DateTimeField(blank=True, null=True) + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + + class Meta: + constraints = [ + models.UniqueConstraint( + fields=["user", "jid", "key_type", "key_id"], + name="unique_user_xmpp_omemo_trusted_key", + ), + ] + indexes = [ + models.Index( + fields=["user", "trusted", "updated_at"], + name="core_userxomemo_trusted_idx", + ), + models.Index( + fields=["user", "jid", "updated_at"], name="core_userxomemo_jid_idx" + ), ] @@ -2921,6 +2979,7 @@ class UserXmppSecuritySettings(models.Model): related_name="xmpp_security_settings", ) require_omemo = models.BooleanField(default=False) + encrypt_contact_messages_with_omemo = models.BooleanField(default=True) created_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) @@ -2938,7 +2997,9 @@ class UserAccessibilitySettings(models.Model): class TaskCompletionPattern(models.Model): id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) - user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="task_completion_patterns") + user = models.ForeignKey( + User, on_delete=models.CASCADE, related_name="task_completion_patterns" + ) phrase = models.CharField(max_length=64) enabled = models.BooleanField(default=True) position = models.PositiveIntegerField(default=0) diff --git a/core/modules/router.py b/core/modules/router.py index 320cef4..ea7988a 100644 --- a/core/modules/router.py +++ b/core/modules/router.py @@ -4,22 +4,22 @@ import re from asgiref.sync import sync_to_async from django.conf import settings +from core.assist.engine import process_inbound_assist from core.clients import transport -from core.events import event_ledger_status from core.clients.instagram import InstagramClient from core.clients.signal import SignalClient from core.clients.whatsapp import WhatsAppClient from core.clients.xmpp import XMPPClient -from core.assist.engine import process_inbound_assist from core.commands.base import CommandContext from core.commands.engine import process_inbound_message +from core.events import event_ledger_status from core.messaging import history from core.models import PersonIdentifier +from core.observability.tracing import ensure_trace_id from core.presence import AvailabilitySignal, record_native_signal from core.realtime.typing_state import set_person_typing_state from core.translation.engine import process_inbound_translation from core.util import logs -from core.observability.tracing import ensure_trace_id class UnifiedRouter(object): @@ -119,7 +119,9 @@ class UnifiedRouter(object): return identifiers = await self._resolve_identifier_objects(protocol, identifier) if identifiers: - outgoing = str(getattr(local_message, "custom_author", "") or "").strip().upper() in { + outgoing = str( + getattr(local_message, "custom_author", "") or "" + ).strip().upper() in { "USER", "BOT", } @@ -268,7 +270,9 @@ class UnifiedRouter(object): ts=int(read_ts or 0), payload={ "origin": "router.message_read", - "message_timestamps": [int(v) for v in list(timestamps or []) if str(v).isdigit()], + "message_timestamps": [ + int(v) for v in list(timestamps or []) if str(v).isdigit() + ], "read_by": str(read_by or row.identifier), }, ) diff --git a/core/presence/engine.py b/core/presence/engine.py index 5d51e21..d32ea97 100644 --- a/core/presence/engine.py +++ b/core/presence/engine.py @@ -12,9 +12,15 @@ from core.models import ( PersonIdentifier, User, ) + from .inference import fade_confidence, now_ms, should_fade -POSITIVE_SOURCE_KINDS = {"native_presence", "read_receipt", "typing_start", "message_in"} +POSITIVE_SOURCE_KINDS = { + "native_presence", + "read_receipt", + "typing_start", + "message_in", +} @dataclass(slots=True) @@ -99,7 +105,8 @@ def record_native_signal(signal: AvailabilitySignal) -> ContactAvailabilityEvent person_identifier=signal.person_identifier, service=str(signal.service or "").strip().lower() or "signal", source_kind=str(signal.source_kind or "").strip() or "native_presence", - availability_state=str(signal.availability_state or "unknown").strip() or "unknown", + availability_state=str(signal.availability_state or "unknown").strip() + or "unknown", confidence=float(signal.confidence or 0.0), ts=_normalize_ts(signal.ts), payload=dict(signal.payload or {}), @@ -109,7 +116,9 @@ def record_native_signal(signal: AvailabilitySignal) -> ContactAvailabilityEvent return event -def record_inferred_signal(signal: AvailabilitySignal) -> ContactAvailabilityEvent | None: +def record_inferred_signal( + signal: AvailabilitySignal, +) -> ContactAvailabilityEvent | None: settings_row = get_settings(signal.user) if not settings_row.enabled or not settings_row.inference_enabled: return None @@ -151,7 +160,9 @@ def ensure_fading_state( return None if latest.source_kind not in POSITIVE_SOURCE_KINDS: return None - if not should_fade(int(latest.ts or 0), current_ts, settings_row.fade_threshold_seconds): + if not should_fade( + int(latest.ts or 0), current_ts, settings_row.fade_threshold_seconds + ): return None elapsed = max(0, current_ts - int(latest.ts or 0)) diff --git a/core/presence/query.py b/core/presence/query.py index 82f548c..06d1217 100644 --- a/core/presence/query.py +++ b/core/presence/query.py @@ -3,6 +3,7 @@ from __future__ import annotations from django.db.models import Q from core.models import ContactAvailabilityEvent, ContactAvailabilitySpan, Person, User + from .engine import ensure_fading_state from .inference import now_ms @@ -19,9 +20,7 @@ def spans_for_range( qs = ContactAvailabilitySpan.objects.filter( user=user, person=person, - ).filter( - Q(start_ts__lte=end_ts) & Q(end_ts__gte=start_ts) - ) + ).filter(Q(start_ts__lte=end_ts) & Q(end_ts__gte=start_ts)) if service: qs = qs.filter(service=str(service).strip().lower()) diff --git a/core/security/__init__.py b/core/security/__init__.py index ce85308..d6f58b8 100644 --- a/core/security/__init__.py +++ b/core/security/__init__.py @@ -1,2 +1 @@ """Security helpers shared across transport adapters.""" - diff --git a/core/security/attachments.py b/core/security/attachments.py index 3fe24e7..861f4ad 100644 --- a/core/security/attachments.py +++ b/core/security/attachments.py @@ -101,7 +101,9 @@ def validate_attachment_metadata( raise ValueError(f"blocked_mime_type:{normalized_type}") allow_unmatched = bool(getattr(settings, "ATTACHMENT_ALLOW_UNKNOWN_MIME", False)) - if not any(fnmatch(normalized_type, pattern) for pattern in _allowed_mime_patterns()): + if not any( + fnmatch(normalized_type, pattern) for pattern in _allowed_mime_patterns() + ): if not allow_unmatched: raise ValueError(f"unsupported_mime_type:{normalized_type}") diff --git a/core/security/command_policy.py b/core/security/command_policy.py index cdccf12..f3e0d6f 100644 --- a/core/security/command_policy.py +++ b/core/security/command_policy.py @@ -68,15 +68,13 @@ def _omemo_facts(ctx: CommandSecurityContext) -> tuple[str, str]: message_meta = dict(ctx.message_meta or {}) payload = dict(ctx.payload or {}) xmpp_meta = dict(message_meta.get("xmpp") or {}) - status = str( - xmpp_meta.get("omemo_status") - or payload.get("omemo_status") - or "" - ).strip().lower() + status = ( + str(xmpp_meta.get("omemo_status") or payload.get("omemo_status") or "") + .strip() + .lower() + ) client_key = str( - xmpp_meta.get("omemo_client_key") - or payload.get("omemo_client_key") - or "" + xmpp_meta.get("omemo_client_key") or payload.get("omemo_client_key") or "" ).strip() return status, client_key @@ -160,7 +158,8 @@ def evaluate_command_policy( service = _normalize_service(context.service) channel = _normalize_channel(context.channel_identifier) allowed_services = [ - item.lower() for item in _normalize_list(getattr(policy, "allowed_services", [])) + item.lower() + for item in _normalize_list(getattr(policy, "allowed_services", [])) ] global_allowed_services = [ item.lower() diff --git a/core/tasks/chat_defaults.py b/core/tasks/chat_defaults.py index 61cad49..f84440d 100644 --- a/core/tasks/chat_defaults.py +++ b/core/tasks/chat_defaults.py @@ -83,7 +83,9 @@ def ensure_default_source_for_chat( message=None, ): service_key = str(service or "").strip().lower() - normalized_identifier = normalize_channel_identifier(service_key, channel_identifier) + normalized_identifier = normalize_channel_identifier( + service_key, channel_identifier + ) variants = channel_variants(service_key, normalized_identifier) if not service_key or not variants: return None diff --git a/core/tasks/codex_approval.py b/core/tasks/codex_approval.py index fb142f8..dcd6bbd 100644 --- a/core/tasks/codex_approval.py +++ b/core/tasks/codex_approval.py @@ -72,9 +72,13 @@ def queue_codex_event_with_pre_approval( }, ) - cfg = TaskProviderConfig.objects.filter(user=user, provider=provider, enabled=True).first() + cfg = TaskProviderConfig.objects.filter( + user=user, provider=provider, enabled=True + ).first() settings_payload = dict(getattr(cfg, "settings", {}) or {}) - approver_service = str(settings_payload.get("approver_service") or "").strip().lower() + approver_service = ( + str(settings_payload.get("approver_service") or "").strip().lower() + ) approver_identifier = str(settings_payload.get("approver_identifier") or "").strip() if approver_service and approver_identifier: try: diff --git a/core/tasks/codex_support.py b/core/tasks/codex_support.py index 3d1f850..18cbc38 100644 --- a/core/tasks/codex_support.py +++ b/core/tasks/codex_support.py @@ -57,7 +57,9 @@ def resolve_external_chat_id(*, user, provider: str, service: str, channel: str) provider=provider, enabled=True, ) - .filter(Q(person_identifier=person_identifier) | Q(person=person_identifier.person)) + .filter( + Q(person_identifier=person_identifier) | Q(person=person_identifier.person) + ) .order_by("-updated_at", "-id") .first() ) diff --git a/core/tasks/engine.py b/core/tasks/engine.py index 200ad58..99b03ba 100644 --- a/core/tasks/engine.py +++ b/core/tasks/engine.py @@ -22,16 +22,23 @@ from core.models import ( TaskEpic, TaskProviderConfig, ) -from core.tasks.chat_defaults import ensure_default_source_for_chat, resolve_message_scope -from core.tasks.codex_approval import queue_codex_event_with_pre_approval -from core.tasks.providers import get_provider -from core.tasks.codex_support import resolve_external_chat_id from core.security.command_policy import CommandSecurityContext, evaluate_command_policy +from core.tasks.chat_defaults import ( + ensure_default_source_for_chat, + resolve_message_scope, +) +from core.tasks.codex_approval import queue_codex_event_with_pre_approval +from core.tasks.codex_support import resolve_external_chat_id +from core.tasks.providers import get_provider _TASK_HINT_RE = re.compile(r"\b(todo|task|action|need to|please)\b", re.IGNORECASE) -_COMPLETION_RE = re.compile(r"\b(done|completed|fixed)\s*#([A-Za-z0-9_-]+)\b", re.IGNORECASE) +_COMPLETION_RE = re.compile( + r"\b(done|completed|fixed)\s*#([A-Za-z0-9_-]+)\b", re.IGNORECASE +) _BALANCED_HINT_RE = re.compile(r"\b(todo|task|action item|action)\b", re.IGNORECASE) -_BROAD_HINT_RE = re.compile(r"\b(todo|task|action|need to|please|reminder)\b", re.IGNORECASE) +_BROAD_HINT_RE = re.compile( + r"\b(todo|task|action|need to|please|reminder)\b", re.IGNORECASE +) _PREFIX_HEAD_TRIM = " \t\r\n`'\"([{<*#-–—_>.,:;!/?\\|" _LIST_TASKS_RE = re.compile( r"^\s*(?:\.l(?:\s+list(?:\s+tasks?)?)?|\.list(?:\s+tasks?)?)\s*$", @@ -151,15 +158,23 @@ async def _resolve_source_mappings(message: Message) -> list[ChatTaskSource]: lookup_service = str(message.source_service or "").strip().lower() variants = _channel_variants(lookup_service, message.source_chat_id or "") session_identifier = getattr(getattr(message, "session", None), "identifier", None) - canonical_service = str(getattr(session_identifier, "service", "") or "").strip().lower() - canonical_identifier = str(getattr(session_identifier, "identifier", "") or "").strip() + canonical_service = ( + str(getattr(session_identifier, "service", "") or "").strip().lower() + ) + canonical_identifier = str( + getattr(session_identifier, "identifier", "") or "" + ).strip() if lookup_service == "web" and canonical_service and canonical_service != "web": lookup_service = canonical_service variants = _channel_variants(lookup_service, message.source_chat_id or "") for expanded in _channel_variants(lookup_service, canonical_identifier): if expanded and expanded not in variants: variants.append(expanded) - elif canonical_service and canonical_identifier and canonical_service == lookup_service: + elif ( + canonical_service + and canonical_identifier + and canonical_service == lookup_service + ): for expanded in _channel_variants(canonical_service, canonical_identifier): if expanded and expanded not in variants: variants.append(expanded) @@ -170,10 +185,14 @@ async def _resolve_source_mappings(message: Message) -> list[ChatTaskSource]: if not signal_value: continue companions += await sync_to_async(list)( - Chat.objects.filter(source_uuid=signal_value).values_list("source_number", flat=True) + Chat.objects.filter(source_uuid=signal_value).values_list( + "source_number", flat=True + ) ) companions += await sync_to_async(list)( - Chat.objects.filter(source_number=signal_value).values_list("source_uuid", flat=True) + Chat.objects.filter(source_number=signal_value).values_list( + "source_uuid", flat=True + ) ) for candidate in companions: for expanded in _channel_variants("signal", str(candidate or "").strip()): @@ -271,7 +290,8 @@ def _normalize_flags(raw: dict | None) -> dict: row = dict(raw or {}) return { "derive_enabled": _to_bool(row.get("derive_enabled"), True), - "match_mode": str(row.get("match_mode") or "balanced").strip().lower() or "balanced", + "match_mode": str(row.get("match_mode") or "balanced").strip().lower() + or "balanced", "require_prefix": _to_bool(row.get("require_prefix"), False), "allowed_prefixes": _parse_prefixes(row.get("allowed_prefixes")), "completion_enabled": _to_bool(row.get("completion_enabled"), True), @@ -287,7 +307,9 @@ def _normalize_partial_flags(raw: dict | None) -> dict: if "derive_enabled" in row: out["derive_enabled"] = _to_bool(row.get("derive_enabled"), True) if "match_mode" in row: - out["match_mode"] = str(row.get("match_mode") or "balanced").strip().lower() or "balanced" + out["match_mode"] = ( + str(row.get("match_mode") or "balanced").strip().lower() or "balanced" + ) if "require_prefix" in row: out["require_prefix"] = _to_bool(row.get("require_prefix"), False) if "allowed_prefixes" in row: @@ -304,7 +326,9 @@ def _normalize_partial_flags(raw: dict | None) -> dict: def _effective_flags(source: ChatTaskSource) -> dict: - project_flags = _normalize_flags(getattr(getattr(source, "project", None), "settings", {}) or {}) + project_flags = _normalize_flags( + getattr(getattr(source, "project", None), "settings", {}) or {} + ) source_flags = _normalize_partial_flags(getattr(source, "settings", {}) or {}) merged = dict(project_flags) merged.update(source_flags) @@ -360,7 +384,10 @@ async def _derive_title(message: Message) -> str: {"role": "user", "content": text[:2000]}, ] try: - title = str(await ai_runner.run_prompt(prompt, ai_obj, operation="task_derive_title") or "").strip() + title = str( + await ai_runner.run_prompt(prompt, ai_obj, operation="task_derive_title") + or "" + ).strip() except Exception: title = "" return (title or text)[:255] @@ -376,9 +403,13 @@ async def _derive_title_with_flags(message: Message, flags: dict) -> str: return (cleaned or title or "Untitled task")[:255] -async def _emit_sync_event(task: DerivedTask, event: DerivedTaskEvent, action: str) -> None: +async def _emit_sync_event( + task: DerivedTask, event: DerivedTaskEvent, action: str +) -> None: cfg = await sync_to_async( - lambda: TaskProviderConfig.objects.filter(user=task.user, enabled=True).order_by("provider").first() + lambda: TaskProviderConfig.objects.filter(user=task.user, enabled=True) + .order_by("provider") + .first() )() provider_name = str(getattr(cfg, "provider", "mock") or "mock") provider_settings = dict(getattr(cfg, "settings", {}) or {}) @@ -416,7 +447,11 @@ async def _emit_sync_event(task: DerivedTask, event: DerivedTaskEvent, action: s "source_channel": str(task.source_channel or ""), "external_chat_id": external_chat_id, "origin_message_id": str(getattr(task, "origin_message_id", "") or ""), - "trigger_message_id": str(getattr(event, "source_message_id", "") or getattr(task, "origin_message_id", "") or ""), + "trigger_message_id": str( + getattr(event, "source_message_id", "") + or getattr(task, "origin_message_id", "") + or "" + ), "mode": "default", "payload": event.payload, "memory_context": memory_context, @@ -495,7 +530,9 @@ async def _emit_sync_event(task: DerivedTask, event: DerivedTaskEvent, action: s codex_run.status = status codex_run.result_payload = dict(result.payload or {}) codex_run.error = str(result.error or "") - await sync_to_async(codex_run.save)(update_fields=["status", "result_payload", "error", "updated_at"]) + await sync_to_async(codex_run.save)( + update_fields=["status", "result_payload", "error", "updated_at"] + ) if result.ok and result.external_key and not task.external_key: task.external_key = str(result.external_key) await sync_to_async(task.save)(update_fields=["external_key"]) @@ -503,15 +540,28 @@ async def _emit_sync_event(task: DerivedTask, event: DerivedTaskEvent, action: s async def _completion_regex(message: Message) -> re.Pattern: patterns = await sync_to_async(list)( - TaskCompletionPattern.objects.filter(user=message.user, enabled=True).order_by("position", "created_at") + TaskCompletionPattern.objects.filter(user=message.user, enabled=True).order_by( + "position", "created_at" + ) ) - phrases = [str(row.phrase or "").strip() for row in patterns if str(row.phrase or "").strip()] + phrases = [ + str(row.phrase or "").strip() + for row in patterns + if str(row.phrase or "").strip() + ] if not phrases: phrases = ["done", "completed", "fixed"] - return re.compile(r"\\b(?:" + "|".join(re.escape(p) for p in phrases) + r")\\s*#([A-Za-z0-9_-]+)\\b", re.IGNORECASE) + return re.compile( + r"\\b(?:" + + "|".join(re.escape(p) for p in phrases) + + r")\\s*#([A-Za-z0-9_-]+)\\b", + re.IGNORECASE, + ) -async def _send_scope_message(source: ChatTaskSource, message: Message, text: str) -> None: +async def _send_scope_message( + source: ChatTaskSource, message: Message, text: str +) -> None: await send_message_raw( source.service or message.source_service or "web", source.channel_identifier or message.source_chat_id or "", @@ -521,7 +571,9 @@ async def _send_scope_message(source: ChatTaskSource, message: Message, text: st ) -async def _handle_scope_task_commands(message: Message, sources: list[ChatTaskSource], text: str) -> bool: +async def _handle_scope_task_commands( + message: Message, sources: list[ChatTaskSource], text: str +) -> bool: if not sources: return False body = str(text or "").strip() @@ -538,7 +590,9 @@ async def _handle_scope_task_commands(message: Message, sources: list[ChatTaskSo .order_by("-created_at")[:20] ) if not open_rows: - await _send_scope_message(source, message, "[task] no open tasks in this chat.") + await _send_scope_message( + source, message, "[task] no open tasks in this chat." + ) return True lines = ["[task] open tasks:"] for row in open_rows: @@ -573,7 +627,9 @@ async def _handle_scope_task_commands(message: Message, sources: list[ChatTaskSo .first() )() if task is None: - await _send_scope_message(source, message, "[task] nothing to undo in this chat.") + await _send_scope_message( + source, message, "[task] nothing to undo in this chat." + ) return True ref = str(task.reference_code or "") title = str(task.title or "") @@ -596,10 +652,16 @@ async def _handle_scope_task_commands(message: Message, sources: list[ChatTaskSo .first() )() if task is None: - await _send_scope_message(source, message, f"[task] #{reference} not found.") + await _send_scope_message( + source, message, f"[task] #{reference} not found." + ) return True due_str = f"\ndue: {task.due_date}" if task.due_date else "" - assignee_str = f"\nassignee: {task.assignee_identifier}" if task.assignee_identifier else "" + assignee_str = ( + f"\nassignee: {task.assignee_identifier}" + if task.assignee_identifier + else "" + ) detail = ( f"[task] #{task.reference_code}: {task.title}" f"\nstatus: {task.status_snapshot}" @@ -624,7 +686,9 @@ async def _handle_scope_task_commands(message: Message, sources: list[ChatTaskSo .first() )() if task is None: - await _send_scope_message(source, message, f"[task] #{reference} not found.") + await _send_scope_message( + source, message, f"[task] #{reference} not found." + ) return True task.status_snapshot = "completed" await sync_to_async(task.save)(update_fields=["status_snapshot"]) @@ -633,10 +697,16 @@ async def _handle_scope_task_commands(message: Message, sources: list[ChatTaskSo event_type="completion_marked", actor_identifier=str(message.sender_uuid or ""), source_message=message, - payload={"marker": reference, "command": ".task complete", "via": "chat_command"}, + payload={ + "marker": reference, + "command": ".task complete", + "via": "chat_command", + }, ) await _emit_sync_event(task, event, "complete") - await _send_scope_message(source, message, f"[task] completed #{task.reference_code}: {task.title}") + await _send_scope_message( + source, message, f"[task] completed #{task.reference_code}: {task.title}" + ) return True return False @@ -656,7 +726,9 @@ def _strip_epic_token(text: str) -> str: return re.sub(r"\s{2,}", " ", cleaned).strip() -async def _handle_epic_create_command(message: Message, sources: list[ChatTaskSource], text: str) -> bool: +async def _handle_epic_create_command( + message: Message, sources: list[ChatTaskSource], text: str +) -> bool: match = _EPIC_CREATE_RE.match(str(text or "")) if not match or not sources: return False @@ -766,13 +838,21 @@ async def process_inbound_task_intelligence(message: Message) -> None: if not submit_decision.allowed: return - completion_allowed = any(bool(_effective_flags(source).get("completion_enabled")) for source in sources) + completion_allowed = any( + bool(_effective_flags(source).get("completion_enabled")) for source in sources + ) completion_rx = await _completion_regex(message) if completion_allowed else None - marker_match = (completion_rx.search(text) if completion_rx else None) or (_COMPLETION_RE.search(text) if completion_allowed else None) + marker_match = (completion_rx.search(text) if completion_rx else None) or ( + _COMPLETION_RE.search(text) if completion_allowed else None + ) if marker_match: ref_code = str(marker_match.group(marker_match.lastindex or 1) or "").strip() task = await sync_to_async( - lambda: DerivedTask.objects.filter(user=message.user, reference_code=ref_code).order_by("-created_at").first() + lambda: DerivedTask.objects.filter( + user=message.user, reference_code=ref_code + ) + .order_by("-created_at") + .first() )() if not task: # parser warning event attached to a newly derived placeholder in mapped project @@ -848,7 +928,11 @@ async def process_inbound_task_intelligence(message: Message) -> None: status_snapshot="open", due_date=parsed_due_date, assignee_identifier=parsed_assignee, - immutable_payload={"origin_text": text, "task_text": task_text, "flags": flags}, + immutable_payload={ + "origin_text": text, + "task_text": task_text, + "flags": flags, + }, ) event = await sync_to_async(DerivedTaskEvent.objects.create)( task=task, diff --git a/core/tasks/providers/claude_cli.py b/core/tasks/providers/claude_cli.py index 428cb41..2a66250 100644 --- a/core/tasks/providers/claude_cli.py +++ b/core/tasks/providers/claude_cli.py @@ -40,13 +40,21 @@ class ClaudeCLITaskProvider(TaskProvider): return True if "unrecognized subcommand 'create'" in text and "usage: claude" in text: return True - if "unrecognized subcommand 'append_update'" in text and "usage: claude" in text: + if ( + "unrecognized subcommand 'append_update'" in text + and "usage: claude" in text + ): return True - if "unrecognized subcommand 'mark_complete'" in text and "usage: claude" in text: + if ( + "unrecognized subcommand 'mark_complete'" in text + and "usage: claude" in text + ): return True return False - def _builtin_stub_result(self, op: str, payload: dict, stderr: str) -> ProviderResult: + def _builtin_stub_result( + self, op: str, payload: dict, stderr: str + ) -> ProviderResult: mode = str(payload.get("mode") or "default").strip().lower() external_key = ( str(payload.get("external_key") or "").strip() @@ -117,7 +125,10 @@ class ClaudeCLITaskProvider(TaskProvider): cwd=workspace if workspace else None, ) stderr_probe = str(completed.stderr or "").lower() - if completed.returncode != 0 and "unexpected argument '--op'" in stderr_probe: + if ( + completed.returncode != 0 + and "unexpected argument '--op'" in stderr_probe + ): completed = subprocess.run( fallback_cmd, capture_output=True, @@ -133,7 +144,9 @@ class ClaudeCLITaskProvider(TaskProvider): payload={"op": op, "timeout_seconds": command_timeout}, ) except Exception as exc: - return ProviderResult(ok=False, error=f"claude_cli_exec_error:{exc}", payload={"op": op}) + return ProviderResult( + ok=False, error=f"claude_cli_exec_error:{exc}", payload={"op": op} + ) stdout = str(completed.stdout or "").strip() stderr = str(completed.stderr or "").strip() @@ -172,7 +185,12 @@ class ClaudeCLITaskProvider(TaskProvider): out_payload.update(parsed) if (not ok) and self._is_task_sync_contract_mismatch(stderr): return self._builtin_stub_result(op, dict(payload or {}), stderr) - return ProviderResult(ok=ok, external_key=ext, error=("" if ok else stderr[:4000]), payload=out_payload) + return ProviderResult( + ok=ok, + external_key=ext, + error=("" if ok else stderr[:4000]), + payload=out_payload, + ) def healthcheck(self, config: dict) -> ProviderResult: command = self._command(config) @@ -193,7 +211,11 @@ class ClaudeCLITaskProvider(TaskProvider): "stdout": str(completed.stdout or "").strip()[:1000], "stderr": str(completed.stderr or "").strip()[:1000], }, - error=("" if completed.returncode == 0 else str(completed.stderr or "").strip()[:1000]), + error=( + "" + if completed.returncode == 0 + else str(completed.stderr or "").strip()[:1000] + ), ) def create_task(self, config: dict, payload: dict) -> ProviderResult: diff --git a/core/tasks/providers/codex_cli.py b/core/tasks/providers/codex_cli.py index 46957db..9d00493 100644 --- a/core/tasks/providers/codex_cli.py +++ b/core/tasks/providers/codex_cli.py @@ -46,7 +46,9 @@ class CodexCLITaskProvider(TaskProvider): return True return False - def _builtin_stub_result(self, op: str, payload: dict, stderr: str) -> ProviderResult: + def _builtin_stub_result( + self, op: str, payload: dict, stderr: str + ) -> ProviderResult: mode = str(payload.get("mode") or "default").strip().lower() external_key = ( str(payload.get("external_key") or "").strip() @@ -117,7 +119,10 @@ class CodexCLITaskProvider(TaskProvider): cwd=workspace if workspace else None, ) stderr_probe = str(completed.stderr or "").lower() - if completed.returncode != 0 and "unexpected argument '--op'" in stderr_probe: + if ( + completed.returncode != 0 + and "unexpected argument '--op'" in stderr_probe + ): completed = subprocess.run( fallback_cmd, capture_output=True, @@ -133,7 +138,9 @@ class CodexCLITaskProvider(TaskProvider): payload={"op": op, "timeout_seconds": command_timeout}, ) except Exception as exc: - return ProviderResult(ok=False, error=f"codex_cli_exec_error:{exc}", payload={"op": op}) + return ProviderResult( + ok=False, error=f"codex_cli_exec_error:{exc}", payload={"op": op} + ) stdout = str(completed.stdout or "").strip() stderr = str(completed.stderr or "").strip() @@ -172,7 +179,12 @@ class CodexCLITaskProvider(TaskProvider): out_payload.update(parsed) if (not ok) and self._is_task_sync_contract_mismatch(stderr): return self._builtin_stub_result(op, dict(payload or {}), stderr) - return ProviderResult(ok=ok, external_key=ext, error=("" if ok else stderr[:4000]), payload=out_payload) + return ProviderResult( + ok=ok, + external_key=ext, + error=("" if ok else stderr[:4000]), + payload=out_payload, + ) def healthcheck(self, config: dict) -> ProviderResult: command = self._command(config) @@ -193,7 +205,11 @@ class CodexCLITaskProvider(TaskProvider): "stdout": str(completed.stdout or "").strip()[:1000], "stderr": str(completed.stderr or "").strip()[:1000], }, - error=("" if completed.returncode == 0 else str(completed.stderr or "").strip()[:1000]), + error=( + "" + if completed.returncode == 0 + else str(completed.stderr or "").strip()[:1000] + ), ) def create_task(self, config: dict, payload: dict) -> ProviderResult: diff --git a/core/tasks/providers/mock.py b/core/tasks/providers/mock.py index 044dae3..b798f29 100644 --- a/core/tasks/providers/mock.py +++ b/core/tasks/providers/mock.py @@ -12,14 +12,30 @@ class MockTaskProvider(TaskProvider): return ProviderResult(ok=True, payload={"provider": self.name}) def create_task(self, config: dict, payload: dict) -> ProviderResult: - ext = str(payload.get("external_key") or "") or f"mock-{int(time.time() * 1000)}" - return ProviderResult(ok=True, external_key=ext, payload={"action": "create_task"}) + ext = ( + str(payload.get("external_key") or "") or f"mock-{int(time.time() * 1000)}" + ) + return ProviderResult( + ok=True, external_key=ext, payload={"action": "create_task"} + ) def append_update(self, config: dict, payload: dict) -> ProviderResult: - return ProviderResult(ok=True, external_key=str(payload.get("external_key") or ""), payload={"action": "append_update"}) + return ProviderResult( + ok=True, + external_key=str(payload.get("external_key") or ""), + payload={"action": "append_update"}, + ) def mark_complete(self, config: dict, payload: dict) -> ProviderResult: - return ProviderResult(ok=True, external_key=str(payload.get("external_key") or ""), payload={"action": "mark_complete"}) + return ProviderResult( + ok=True, + external_key=str(payload.get("external_key") or ""), + payload={"action": "mark_complete"}, + ) def link_task(self, config: dict, payload: dict) -> ProviderResult: - return ProviderResult(ok=True, external_key=str(payload.get("external_key") or ""), payload={"action": "link_task"}) + return ProviderResult( + ok=True, + external_key=str(payload.get("external_key") or ""), + payload={"action": "link_task"}, + ) diff --git a/core/templates/base.html b/core/templates/base.html index ad07418..2dd8ad2 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -342,7 +342,7 @@ hx-trigger="click" hx-swap="innerHTML"> - Message + Compose - Tasks + Task Inbox AI -
- - Security - -
- - Encryption - - - Permission - - - 2FA - -
-
Search - - Queue - - - - OSINT - {% endif %} - - Install -
@@ -423,15 +388,15 @@
- Storage + Data
Sessions - - Documents + + Business Plans
@@ -454,6 +419,19 @@ {% endif %}
+
+ Security +
+ + Encryption + + + Permissions + + + 2FA + +
AI
@@ -470,8 +448,11 @@ Commands + + Business Plans + - Tasks + Task Automation Translation @@ -480,6 +461,16 @@ Availability
+
+ Automation +
+ + Approvals Queue + + + OSINT Workspace + +
Accessibility @@ -499,6 +490,7 @@ {% endif %} {% if user.is_authenticated %} + Logout {% endif %} @@ -510,8 +502,13 @@ + shell.querySelectorAll(".trace-run-tab-panel").forEach(function (panel) { + const isActive = panel.getAttribute("data-tab-panel") === targetName; + panel.classList.toggle("is-hidden", !isActive); + }); + + const lazyUrl = String(trigger.getAttribute("data-lazy-url") || ""); + if (!lazyUrl) { + return; + } + const panel = shell.querySelector( + '.trace-run-tab-panel[data-tab-panel="' + targetName + '"]' + ); + if (!panel || panel.getAttribute("data-loaded") === "1") { + return; + } + panel.setAttribute("data-loaded", "1"); + panel.classList.add("is-loading"); + fetch(lazyUrl, { credentials: "same-origin" }) + .then(function (response) { + if (!response.ok) { + throw new Error("tab load failed"); + } + return response.text(); + }) + .then(function (html) { + panel.innerHTML = html; + }) + .catch(function () { + panel.innerHTML = + '

Unable to load this tab.

'; + }) + .finally(function () { + panel.classList.remove("is-loading"); + }); + }); + })(); + {% endblock %} diff --git a/core/templates/pages/availability-settings.html b/core/templates/pages/availability-settings.html index 1a8e0bf..e9a1d12 100644 --- a/core/templates/pages/availability-settings.html +++ b/core/templates/pages/availability-settings.html @@ -1,71 +1,71 @@ {% extends "base.html" %} {% block content %} -
-
-

Availability Settings

-
- {% csrf_token %} -
-
-
-
-
-
- - +
+
+

Availability Settings

+ + {% csrf_token %} +
+
+
+
+
+
+ + +
+
+ + +
-
- - -
-
- - + + -
-

Availability Event Statistics Per Contact

- - - - - - - - - - - - - - - - - - - - {% for row in contact_stats %} +
+

Availability Event Statistics Per Contact

+
ContactServiceTotalAvailableFadingUnavailableUnknownNativeReadTypingMsg ActivityTimeoutLast Event TS
+ - - - - - - - - - - - - - + + + + + + + + + + + + + - {% empty %} - - {% endfor %} - -
{{ row.person__name }}{{ row.service }}{{ row.total_events }}{{ row.available_events }}{{ row.fading_events }}{{ row.unavailable_events }}{{ row.unknown_events }}{{ row.native_presence_events }}{{ row.read_receipt_events }}{{ row.typing_events }}{{ row.message_activity_events }}{{ row.inferred_timeout_events }}{{ row.last_event_ts }}ContactServiceTotalAvailableFadingUnavailableUnknownNativeReadTypingMsg ActivityTimeoutLast Event TS
No availability events found.
+ + + {% for row in contact_stats %} + + {{ row.person__name }} + {{ row.service }} + {{ row.total_events }} + {{ row.available_events }} + {{ row.fading_events }} + {{ row.unavailable_events }} + {{ row.unknown_events }} + {{ row.native_presence_events }} + {{ row.read_receipt_events }} + {{ row.typing_events }} + {{ row.message_activity_events }} + {{ row.inferred_timeout_events }} + {{ row.last_event_ts }} + + {% empty %} + No availability events found. + {% endfor %} + + +
-
-
+ {% endblock %} diff --git a/core/templates/pages/business-plan-editor.html b/core/templates/pages/business-plan-editor.html index ff60a62..5757cd3 100644 --- a/core/templates/pages/business-plan-editor.html +++ b/core/templates/pages/business-plan-editor.html @@ -28,7 +28,7 @@
- Back + Back To Inbox
diff --git a/core/templates/pages/business-plan-inbox.html b/core/templates/pages/business-plan-inbox.html new file mode 100644 index 0000000..263c710 --- /dev/null +++ b/core/templates/pages/business-plan-inbox.html @@ -0,0 +1,99 @@ +{% extends "base.html" %} + +{% block content %} +
+
+

Business Plan Inbox

+

Review, filter, and open generated business plan documents.

+ +
+
+ Total {{ stats.total|default:0 }} + Draft {{ stats.draft|default:0 }} + Final {{ stats.final|default:0 }} +
+
+ +
+

Filters

+
+
+
+ + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
+
+ +
+
+

Documents

+ Command Routing +
+ + + + + + + + + + + + + + + {% for doc in documents %} + + + + + + + + + + + {% empty %} + + {% endfor %} + +
TitleStatusServiceChannelProfileRevisionsUpdated
{{ doc.title }} + {% if doc.status == "final" %} + final + {% else %} + draft + {% endif %} + {{ doc.source_service }}{{ doc.source_channel_identifier|default:"-" }}{% if doc.command_profile %}{{ doc.command_profile.name }}{% else %}-{% endif %}{{ doc.revision_count }}{{ doc.updated_at }} + Open +
No business plan documents yet.
+
+
+
+{% endblock %} diff --git a/core/templates/pages/codex-settings.html b/core/templates/pages/codex-settings.html index eb3b1be..b90b27b 100644 --- a/core/templates/pages/codex-settings.html +++ b/core/templates/pages/codex-settings.html @@ -1,144 +1,144 @@ {% extends "base.html" %} {% block content %} -
-
-

Codex Status

-

Global per-user Codex task-sync status, runs, and approvals.

+
+
+

Codex Status

+

Global per-user Codex task-sync status, runs, and approvals.

-
-
- Provider codex_cli - Health {% if health and health.ok %}online{% else %}offline{% endif %} - Pending {{ queue_counts.pending }} - Waiting Approval {{ queue_counts.waiting_approval }} -
- {% if health and health.error %} -

Healthcheck error: {{ health.error }}

- {% endif %} -

Config snapshot: command={{ provider_settings.command }}, workspace={{ provider_settings.workspace_root|default:"-" }}, profile={{ provider_settings.default_profile|default:"-" }}, instance={{ provider_settings.instance_label }}, approver={{ provider_settings.approver_service }} {{ provider_settings.approver_identifier }}.

-

Edit in Task Settings.

-
+
+
+ Provider codex_cli + Health {% if health and health.ok %}online{% else %}offline{% endif %} + Pending {{ queue_counts.pending }} + Waiting Approval {{ queue_counts.waiting_approval }} +
+ {% if health and health.error %} +

Healthcheck error: {{ health.error }}

+ {% endif %} +

Config snapshot: command={{ provider_settings.command }}, workspace={{ provider_settings.workspace_root|default:"-" }}, profile={{ provider_settings.default_profile|default:"-" }}, instance={{ provider_settings.instance_label }}, approver={{ provider_settings.approver_service }} {{ provider_settings.approver_identifier }}.

+

Edit in Task Automation.

+
-
-

Run Filters

-
-
-
- - -
-
- - -
-
- - -
-
- -
- +
+

Run Filters

+ +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ +
+
+
+ +
-
- - -
-
- - -
+ + + -
-

Runs

- - - - {% for run in runs %} - - - - - - - - - + + {% empty %} + + {% endfor %} + +
WhenStatusService/ChannelProjectTaskSummaryFilesLinks
{{ run.created_at }}{{ run.status }}{{ run.source_service }} · {{ run.source_channel }}{{ run.project.name|default:"-" }}{% if run.task %}#{{ run.task.reference_code }}{% else %}-{% endif %}{{ run.result_payload.summary|default:"-" }}{{ run.result_payload.files_modified_count|default:"0" }} -
- Details -

Request

+
+

Runs

+ + + + {% for run in runs %} + + + + + + + + + - - {% empty %} - - {% endfor %} - -
WhenStatusService/ChannelProjectTaskSummaryFilesLinks
{{ run.created_at }}{{ run.status }}{{ run.source_service }} · {{ run.source_channel }}{{ run.project.name|default:"-" }}{% if run.task %}#{{ run.task.reference_code }}{% else %}-{% endif %}{{ run.result_payload.summary|default:"-" }}{{ run.result_payload.files_modified_count|default:"0" }} +
+ Details +

Request

{{ run.request_payload }}
-

Result

+

Result

{{ run.result_payload }}
-

Error {{ run.error|default:"-" }}

-
-
No runs.
-
+

Error {{ run.error|default:"-" }}

+
+
No runs.
+
-
-

Permission Queue

- - - - {% for row in permission_requests %} - - - - - - - - - - - {% empty %} - - {% endfor %} - -
RequestedApproval KeyStatusSummaryPermissionsRunTaskActions
{{ row.requested_at }}{{ row.approval_key }}{{ row.status }}{{ row.summary|default:"-" }}
{{ row.requested_permissions }}
{{ row.codex_run_id }}{% if row.codex_run.task %}#{{ row.codex_run.task.reference_code }}{% else %}-{% endif %} - {% if row.status == 'pending' %} -
- {% csrf_token %} - - - -
-
- {% csrf_token %} - - - -
- {% else %} - - - {% endif %} -
No permission requests.
-
-
-
- +
+

Approvals Queue

+ + + + {% for row in permission_requests %} + + + + + + + + + + + {% empty %} + + {% endfor %} + +
RequestedApproval KeyStatusSummaryPermissionsRunTaskActions
{{ row.requested_at }}{{ row.approval_key }}{{ row.status }}{{ row.summary|default:"-" }}
{{ row.requested_permissions }}
{{ row.codex_run_id }}{% if row.codex_run.task %}#{{ row.codex_run.task.reference_code }}{% else %}-{% endif %} + {% if row.status == 'pending' %} +
+ {% csrf_token %} + + + +
+
+ {% csrf_token %} + + + +
+ {% else %} + - + {% endif %} +
No permission requests.
+
+
+
+ {% endblock %} diff --git a/core/templates/pages/command-routing.html b/core/templates/pages/command-routing.html index 55197db..1e427f7 100644 --- a/core/templates/pages/command-routing.html +++ b/core/templates/pages/command-routing.html @@ -393,7 +393,10 @@ {% endfor %}
-

Business Plan Documents

+
+

Recent Business Plan Documents

+ Open Business Plan Inbox +
diff --git a/core/templates/pages/security.html b/core/templates/pages/security.html index 8178732..4d6da48 100644 --- a/core/templates/pages/security.html +++ b/core/templates/pages/security.html @@ -1,709 +1,796 @@ {% extends "base.html" %} {% block content %} -
-
- {% if show_encryption %} -
-
-
-

XMPP Channel

-
TitleStatusSourceUpdatedActions
- - - - - - - - - - - - - - - - - - -
Component JID{{ xmpp_state.omemo_target_jid|default:"—" }}
OMEMO - {% if xmpp_state.omemo_enabled %} - Active - {% else %} - {{ xmpp_state.omemo_status|default:"not configured" }} - {% endif %} -
Status reason{{ xmpp_state.omemo_status_reason|default:"—" }}
Component fingerprint{{ xmpp_state.omemo_fingerprint|default:"—" }}
-

Security Policy

-
- {% csrf_token %} -
- -

When enabled, any plaintext XMPP message to the gateway is rejected before command routing.

-

This is separate from command-scope policy checks such as Require Trusted Fingerprint.

+
+
+ {% if show_encryption %} +
+
+
+

XMPP Channel

+ + + + + + + + + + + + + + + + + + + +
Component JID{{ xmpp_state.omemo_target_jid|default:"—" }}
OMEMO + {% if xmpp_state.omemo_enabled %} + Active + {% else %} + {{ xmpp_state.omemo_status|default:"not configured" }} + {% endif %} +
Status reason{{ xmpp_state.omemo_status_reason|default:"—" }}
Component fingerprint{{ xmpp_state.omemo_fingerprint|default:"—" }}
+

Security Policy

+ + {% csrf_token %} + + +
+ +

When enabled, any plaintext XMPP message to the gateway is rejected before command routing.

+

This is separate from command-scope policy checks such as Require Trusted Fingerprint.

+
+ +
+ +

When enabled, relay text from contacts is sent with OMEMO when available. If disabled, relay text is sent in plaintext.

+
+ +
- - +
+
+
+

Your XMPP Client

+ {% if omemo_row %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Status + {% if omemo_row.status == "detected" %} + {{ omemo_row.status }} + {% elif omemo_row.status == "no_omemo" %} + no OMEMO observed + {% elif omemo_row.status == "error" %} + {{ omemo_row.status }} + {% else %} + {{ omemo_row.status }} + {% endif %} +
Client OMEMO + {% if omemo_client_fingerprint %} +
+
Client fingerprint: {{ omemo_client_fingerprint }}
+

This is your client OMEMO fingerprint observed by the gateway.

+
+ {% elif omemo_client_key_info.has_ids %} +
+ {% if omemo_client_key_info.sid %} +
Your device ID: {{ omemo_client_key_info.sid }}
+ {% endif %} + {% if omemo_client_key_info.rid %} +
Gateway device ID: {{ omemo_client_key_info.rid }}
+ {% endif %} +

These IDs identify the OMEMO devices that participated in the encrypted message.

+
+ {% else %} + {{ omemo_row.latest_client_key|default:"—" }} + {% endif %} +
Contact JID{{ sender_jid.bare|default:"—" }}
Resource{{ sender_jid.resource|default:"—" }}
GIA component{{ omemo_row.last_target_jid|default:"—" }}
Last seen{{ omemo_row.last_seen_at|default:"—" }}
Updated{{ omemo_row.updated_at }}
+ {% else %} +

No OMEMO observation recorded yet. Send a message via XMPP to populate this.

+ {% endif %} +
+
-
-
+
-

Your XMPP Client

- {% if omemo_row %} +

OMEMO Trust Management

+

+ Manage trust for discovered OMEMO keys observed by the gateway. +

+

+ Note: You are responsible for trusting your own other devices from your other XMPP clients. +

+ {% if discovered_omemo_keys %} + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + {% for item in discovered_omemo_keys %} + + + + + + + + + {% endfor %}
JIDTypeDiscovered keySourceTrusted
Status - {% if omemo_row.status == "detected" %} - {{ omemo_row.status }} - {% elif omemo_row.status == "no_omemo" %} - no OMEMO observed - {% elif omemo_row.status == "error" %} - {{ omemo_row.status }} - {% else %} - {{ omemo_row.status }} - {% endif %} -
Contact key{{ omemo_row.latest_client_key|default:"—" }}
Contact JID{{ sender_jid.bare|default:"—" }}
Resource{{ sender_jid.resource|default:"—" }}
GIA component{{ omemo_row.last_target_jid|default:"—" }}
Last seen{{ omemo_row.last_seen_at|default:"—" }}
Updated{{ omemo_row.updated_at }}
{{ item.jid }}{{ item.key_type }}{{ item.key_id }}{{ item.label }} + {% if item.trusted %} + trusted + {% else %} + not trusted + {% endif %} + +
+ {% csrf_token %} + + + + + + + +
+
{% else %} -

No OMEMO observation recorded yet. Send a message via XMPP to populate this.

+

No discovered OMEMO keys yet. Send an OMEMO message to populate this list.

{% endif %}
-
-
- {% endif %} + {% endif %} - {% if show_permission %} -
-

Global Scope Override

-

- This scope can force settings across all Command Security Scopes. -

-
-
- {% csrf_token %} - - - - -
-
-

Global Scope Override

-

Remote controls for local scope security checkboxes.

-

global.override

-
-
- Scope Enabled - {% if global_override.values.scope_enabled == "on" %} - Force On - {% elif global_override.values.scope_enabled == "off" %} - Force Off - {% else %} - Per Scope - {% endif %} -
-
- -
- -
- {% for service in policy_services %} - {{ service }} - {% endfor %} -
-
- -
- - - -
-

Set each field to Per Scope to edit that field inside local scopes.

- -
-
- -
- - -
-
- -
-
-
- -
- - -
-
- - {% if security_settings.require_omemo %} -

Locked by Encryption setting: disable "Require OMEMO encryption" to edit this override.

- {% endif %} -
-
-
- -
- - -
-
- -
-
- -
- {% for service in policy_services %} - - {% endfor %} -
-

Allowed Services: xmpp, whatsapp, signal, instagram, web.

-

Leave all unchecked to allow all services.

-
-
- -
- {% for rule in global_override.channel_rules %} -
-
- + {% if show_permission %} +
+

Global Scope Override

+

+ This scope can force settings across all Command Security Scopes. +

+
+ + {% csrf_token %} + + + + +
+
+

Global Scope Override

+

Remote controls for local scope security checkboxes.

+

global.override

+
+
+ Scope Enabled + {% if global_override.values.scope_enabled == "on" %} + Force On + {% elif global_override.values.scope_enabled == "off" %} + Force Off + {% else %} + Per Scope + {% endif %}
- -
- {% endfor %} -
- -

Leave pattern rows empty to allow all channels for allowed services.

-
- - -
-
-
-

Fine-Grained Security Scopes

-

- Choose a top-level category, expand a scope, then click Change to edit that scope. -

-
- -
- {% for group in policy_groups %} -
-
- {% for row in group.rows %} -
- - - {{ row.label }} - {{ row.scope_key }} - - - Scope Enabled - {% if row.enabled %} - On - {% else %} - Off - {% endif %} - - -
- {% csrf_token %} - - -

{{ row.description }}

- -
- -
- -
- -
- {% for service in policy_services %} - {{ service }} - {% endfor %} +
+ +
+ {% for service in policy_services %} + {{ service }} + {% endfor %} +
-
-
- - - -
- -
- -
- {% for service in policy_services %} -
+

Set each field to Per Scope to edit that field inside local scopes.

-
- -
- {% for rule in row.channel_rules %} -
-
- +
+
+ +
+ +
- -
+ +
+
+
+ +
+ + +
+
+ + {% if security_settings.require_omemo %} +

Locked by Encryption setting: disable "Require OMEMO encryption" to edit this override.

+ {% endif %} +
+
+
+ +
+ + +
+
+ +
+
+ +
+ {% for service in policy_services %} + + {% endfor %} +
+

Allowed Services: xmpp, whatsapp, signal, instagram, web.

+

Leave all unchecked to allow all services.

+
+
+ +
+ {% for rule in global_override.channel_rules %} +
+
+ +
+ + +
+ {% endfor %} +
+ +

Leave pattern rows empty to allow all channels for allowed services.

+
+ + +
+
+ +
+

Fine-Grained Security Scopes

+

+ Choose a top-level category, expand a scope, then click Change to edit that scope. +

+
+ +
+ {% for group in policy_groups %} +
+
+ {% for row in group.rows %} +
+ + + {{ row.label }} + {{ row.scope_key }} + + + Scope Enabled + {% if row.enabled %} + On + {% else %} + Off + {% endif %} + + +
+ {% csrf_token %} + + +

{{ row.description }}

+ +
+ +
+ +
+ +
+ {% for service in policy_services %} + {{ service }} + {% endfor %} +
+
+ +
+ + + +
+ +
+ +
+ {% for service in policy_services %} + + {% endfor %} +
+

Allowed Services: xmpp, whatsapp, signal, instagram, web.

+

Leave all unchecked to allow all services.

+
+ +
+ +
+ {% for rule in row.channel_rules %} +
+
+ +
+ + +
+ {% endfor %} +
+ +

Leave pattern rows empty to allow all channels for allowed services.

+
+ + +
+
{% endfor %}
- -

Leave pattern rows empty to allow all channels for allowed services.

- - - -
{% endfor %}
-
- {% endfor %} -
- {% endif %} + {% endif %} - {% if show_encryption %} -
-

OMEMO Enablement Plan

-

Complete each step to achieve end-to-end encrypted messaging with the gateway.

- - - {% for step in omemo_plan %} - - - - - + {% if show_encryption %} +
+

OMEMO Enablement Plan

+

Complete each step to achieve end-to-end encrypted messaging with the gateway.

+
- {% if step.done %} - ✓ - {% else %} - ○ - {% endif %} - {{ step.label }}{{ step.hint }}
+ + {% for step in omemo_plan %} + + + + + + {% endfor %} + +
+ {% if step.done %} + ✓ + {% else %} + ○ + {% endif %} + {{ step.label }}{{ step.hint }}
+
+ {% endif %} + +
+ + + - + function updateGlobalModeUI(field) { + const hiddenInput = document.querySelector('input[data-global-mode-input="' + field + '"]'); + const checkbox = document.querySelector('input[data-global-visual-checkbox="' + field + '"]'); + const label = document.querySelector('[data-global-mode-label="' + field + '"]'); + if (!hiddenInput || !checkbox || !label) { + return; + } + const mode = String(hiddenInput.value || "").toLowerCase(); + checkbox.checked = mode === "on"; + checkbox.indeterminate = mode === "per_scope"; + + label.classList.remove("is-success", "is-light", "is-info"); + if (mode === "on") { + label.classList.add("is-success"); + label.textContent = "Force On"; + } else if (mode === "off") { + label.classList.add("is-light"); + label.textContent = "Force Off"; + } else { + label.classList.add("is-info"); + label.textContent = "Per Scope"; + } + + document.querySelectorAll('[data-global-mode-set="' + field + '"]').forEach(function (btn) { + const selected = String(btn.getAttribute("data-mode") || "").toLowerCase() === mode; + btn.classList.toggle("is-link", selected); + }); + } + + function setGlobalMode(field, mode) { + if (!field) { + return; + } + const hiddenInput = document.querySelector('input[data-global-mode-input="' + field + '"]'); + if (!hiddenInput) { + return; + } + hiddenInput.value = mode; + updateGlobalModeUI(field); + const form = hiddenInput.closest("form"); + refreshScopeCapsule(form); + } + + document.querySelectorAll("[data-global-change-toggle]").forEach(function (btn) { + btn.addEventListener("click", function () { + const field = String(btn.getAttribute("data-global-change-toggle") || ""); + const picker = document.querySelector('[data-global-mode-picker="' + field + '"]'); + if (!picker) { + return; + } + const currentlyHidden = picker.classList.contains("is-hidden"); + document.querySelectorAll("[data-global-mode-picker]").forEach(function (row) { + row.classList.add("is-hidden"); + }); + if (currentlyHidden) { + picker.classList.remove("is-hidden"); + } + }); + }); + + document.querySelectorAll("[data-global-mode-set]").forEach(function (btn) { + btn.addEventListener("click", function () { + const field = String(btn.getAttribute("data-global-mode-set") || ""); + const mode = String(btn.getAttribute("data-mode") || ""); + setGlobalMode(field, mode); + const picker = document.querySelector('[data-global-mode-picker="' + field + '"]'); + if (picker) { + picker.classList.add("is-hidden"); + } + }); + }); + + ["scope_enabled", "require_omemo", "require_trusted_fingerprint"].forEach(function (field) { + updateGlobalModeUI(field); + }); + + document.querySelectorAll("[data-policy-tab-button]").forEach(function (tab) { + tab.addEventListener("click", function () { + const key = String(tab.getAttribute("data-policy-tab-button") || ""); + if (!key) { + return; + } + document.querySelectorAll("[data-policy-tab-button]").forEach(function (node) { + node.classList.remove("is-active"); + }); + document.querySelectorAll("[data-policy-tab-panel]").forEach(function (panel) { + panel.classList.remove("is-active"); + }); + tab.classList.add("is-active"); + const target = document.querySelector('[data-policy-tab-panel="' + key + '"]'); + if (target) { + target.classList.add("is-active"); + } + }); + }); + + document.querySelectorAll(".scope-editor-card").forEach(function (details) { + details.addEventListener("toggle", function () { + if (details.open) { + const form = details.querySelector("form[data-scope-form]"); + if (form) { + refreshScopeCapsule(form); + } + } + }); + }); + + })(); + + {% endblock %} diff --git a/core/templates/pages/settings-category.html b/core/templates/pages/settings-category.html index 9c00187..44c3254 100644 --- a/core/templates/pages/settings-category.html +++ b/core/templates/pages/settings-category.html @@ -1,22 +1,22 @@ {% extends "base.html" %} {% block content %} -
-
-

{{ category_title }}

-

{{ category_description }}

-
- +
+
+

{{ category_title }}

+

{{ category_description }}

+
+ +
+
+

Choose a tab above to open settings in this category.

+
-
-

Choose a tab above to open settings in this category.

-
-
-
+ {% endblock %} diff --git a/core/templates/pages/tasks-detail.html b/core/templates/pages/tasks-detail.html index 10eee0e..bd0fccc 100644 --- a/core/templates/pages/tasks-detail.html +++ b/core/templates/pages/tasks-detail.html @@ -1,127 +1,127 @@ {% extends "base.html" %} {% block content %} -
-

Task #{{ task.reference_code }}: {{ task.title }}

-

{{ task.project.name }}{% if task.epic %} / {{ task.epic.name }}{% endif %} · {{ task.status_snapshot }}

-

- Created by {{ task.creator_label|default:"Unknown" }} - {% if task.origin_message_id %} - · Source message {{ task.origin_message_id }} - {% endif %} -

-
- Back -
- {% csrf_token %} - - - -
-
-
-

Events

- - - - {% for row in events %} - - - - - + + {% empty %} + + {% endfor %} + +
WhenTypeActorPayload
{{ row.created_at }}{{ row.event_type }} - {{ row.actor_display|default:"Unknown" }} - {% if row.actor_identifier and row.actor_identifier != row.actor_display %} -
{{ row.actor_identifier }}
- {% endif %} - 		- {% if row.payload_view.summary_items %} -
- {% for item in row.payload_view.summary_items %} - {{ item.0 }}: {{ item.1 }} - {% endfor %} -
- {% endif %} -
- View payload JSON +
+

Task #{{ task.reference_code }}: {{ task.title }}

+

{{ task.project.name }}{% if task.epic %} / {{ task.epic.name }}{% endif %} · {{ task.status_snapshot }}

+

+ Created by {{ task.creator_label|default:"Unknown" }} + {% if task.origin_message_id %} + · Source message {{ task.origin_message_id }} + {% endif %} +

+
+ Back +
+ {% csrf_token %} + + + +
+
+
+

Events

+ + + + {% for row in events %} + + + + + - - {% empty %} - - {% endfor %} - -
WhenTypeActorPayload
{{ row.created_at }}{{ row.event_type }} + {{ row.actor_display|default:"Unknown" }} + {% if row.actor_identifier and row.actor_identifier != row.actor_display %} +
{{ row.actor_identifier }}
+ {% endif %} + 		+ {% if row.payload_view.summary_items %} +
+ {% for item in row.payload_view.summary_items %} + {{ item.0 }}: {{ item.1 }} + {% endfor %} +
+ {% endif %} +
+ View payload JSON 
{{ row.payload_view.pretty_text }}
-
-
No events.
-
-
-

External Sync

- - - - {% for row in sync_events %} - - {% empty %} - - {% endfor %} - -
WhenProviderStatusError
{{ row.updated_at }}{{ row.provider }}{{ row.status }}{{ row.error }}
No sync events.
-
-
-

Codex Runs

- - - - {% for row in codex_runs %} - - - - - - - - {% empty %} - - {% endfor %} - -
WhenStatusSummaryFilesError
{{ row.updated_at }}{{ row.status }}{{ row.result_payload.summary|default:"-" }}{{ row.result_payload.files_modified_count|default:"0" }}{{ row.error|default:"" }}
No Codex runs.
-
-
-

Permission Requests

- - - - {% for row in permission_requests %} - - - - - - - - {% empty %} - - {% endfor %} - -
WhenApproval KeyStatusSummaryResolved
{{ row.requested_at }}{{ row.approval_key }}{{ row.status }}{{ row.summary|default:"-" }}{{ row.resolved_at|default:"-" }}
No permission requests.
-
-
- +
+
No events.
+
+
+

External Sync

+ + + + {% for row in sync_events %} + + {% empty %} + + {% endfor %} + +
WhenProviderStatusError
{{ row.updated_at }}{{ row.provider }}{{ row.status }}{{ row.error }}
No sync events.
+
+
+

Codex Runs

+ + + + {% for row in codex_runs %} + + + + + + + + {% empty %} + + {% endfor %} + +
WhenStatusSummaryFilesError
{{ row.updated_at }}{{ row.status }}{{ row.result_payload.summary|default:"-" }}{{ row.result_payload.files_modified_count|default:"0" }}{{ row.error|default:"" }}
No Codex runs.
+
+
+

Permission Requests

+ + + + {% for row in permission_requests %} + + + + + + + + {% empty %} + + {% endfor %} + +
WhenApproval KeyStatusSummaryResolved
{{ row.requested_at }}{{ row.approval_key }}{{ row.status }}{{ row.summary|default:"-" }}{{ row.resolved_at|default:"-" }}
No permission requests.
+
+
+ {% endblock %} diff --git a/core/templates/pages/tasks-epic.html b/core/templates/pages/tasks-epic.html index bd21457..abaab76 100644 --- a/core/templates/pages/tasks-epic.html +++ b/core/templates/pages/tasks-epic.html @@ -1,22 +1,22 @@ {% extends "base.html" %} {% block content %} -
-

Epic: {{ epic.name }}

-
Back to project
-
-
    - {% for row in tasks %} -
  • - #{{ row.reference_code }} {{ row.title }} - · by {{ row.creator_label|default:"Unknown" }} - {% if row.creator_identifier %} - {{ row.creator_identifier }} - {% endif %} -
    • - {% empty %} -
  • No tasks.
    • - {% endfor %} -
-
-
+
+

Epic: {{ epic.name }}

+
Back to project
+
+
    + {% for row in tasks %} +
  • + #{{ row.reference_code }} {{ row.title }} + · by {{ row.creator_label|default:"Unknown" }} + {% if row.creator_identifier %} + {{ row.creator_identifier }} + {% endif %} +
    • + {% empty %} +
  • No tasks.
    • + {% endfor %} +
+
+
{% endblock %} diff --git a/core/templates/pages/tasks-group.html b/core/templates/pages/tasks-group.html index 5731fb4..77f9d74 100644 --- a/core/templates/pages/tasks-group.html +++ b/core/templates/pages/tasks-group.html @@ -1,84 +1,84 @@ {% extends "base.html" %} {% block content %} -
-

Group Tasks: {{ channel_display_name }}

-

{{ service_label }}

-
-

Create Or Map Project

- {% if primary_project %} +
+

Group Task Inbox: {{ channel_display_name }}

+

{{ service_label }}

+
+

Create Or Map Project

+ {% if primary_project %} +
+ {% csrf_token %} + +
+
+ + +
+
+ +
+
+
+ {% endif %}
{% csrf_token %} - +
-
- - +
+ +
-
- +
+ + +
+
+
- {% endif %} -
- {% csrf_token %} - -
-
- - -
-
- - -
-
- -
-
-
-
- {% csrf_token %} - -
-
- -
- + + {% csrf_token %} + +
+
+ +
+ +
+
+
+
-
- -
-
- -
- {% if not tasks %} -
-

No Tasks Yet

-
-

This group has no derived tasks yet. To start populating this view:

-
    -
  1. Open Task Settings and confirm this chat is mapped under Group Mapping.
    2. -
  2. Send task-like messages in this group, for example: task: ship v1, todo: write tests, please review PR.
    3. -
  3. Mark completion explicitly with a phrase + reference, for example: done #12, completed #12, fixed #12.
    4. -
  4. Refresh this page; new derived tasks and events should appear automatically.
    5. -
-
+
- {% endif %} -
-

Mappings

- - - - {% for row in mappings %} + {% if not tasks %} +
+

No Tasks Yet

+
+

This group has no derived tasks yet. To start populating this view:

+
    +
  1. Open Task Automation and confirm this chat is mapped under Group Mapping.
    2. +
  2. Send task-like messages in this group, for example: task: ship v1, todo: write tests, please review PR.
    3. +
  3. Mark completion explicitly with a phrase + reference, for example: done #12, completed #12, fixed #12.
    4. +
  4. Refresh this page; new derived tasks and events should appear automatically.
    5. +
+
+
+ {% endif %} +
+

Mappings

+
ProjectEpicChannelEnabled
+ + + {% for row in mappings %} @@ -88,36 +88,36 @@ - {% empty %} - - {% endfor %} - -
ProjectEpicChannelEnabled
{{ row.project.name }} {% if row.epic %}{{ row.epic.name }}{% else %}-{% endif %}{{ row.enabled }} Open Project
No mappings for this group.
-
-
-

Derived Tasks

- - - - {% for row in tasks %} - - - - - - - - - {% empty %} - - {% endfor %} - -
RefTitleCreated ByProjectStatus
#{{ row.reference_code }}{{ row.title }} - {{ row.creator_label|default:"Unknown" }} - {% if row.creator_identifier %} -
{{ row.creator_identifier }}
- {% endif %} - 		{{ row.project.name }}{% if row.epic %} / {{ row.epic.name }}{% endif %}{{ row.status_snapshot }}Open
No tasks yet.
-
-
+ {% empty %} + No mappings for this group. + {% endfor %} + + +
+
+

Derived Tasks

+ + + + {% for row in tasks %} + + + + + + + + + {% empty %} + + {% endfor %} + +
RefTitleCreated ByProjectStatus
#{{ row.reference_code }}{{ row.title }} + {{ row.creator_label|default:"Unknown" }} + {% if row.creator_identifier %} +
{{ row.creator_identifier }}
+ {% endif %} + 		{{ row.project.name }}{% if row.epic %} / {{ row.epic.name }}{% endif %}{{ row.status_snapshot }}Open
No tasks yet.
+
+
{% endblock %} diff --git a/core/templates/pages/tasks-hub.html b/core/templates/pages/tasks-hub.html index fbd8b02..22c434b 100644 --- a/core/templates/pages/tasks-hub.html +++ b/core/templates/pages/tasks-hub.html @@ -1,204 +1,204 @@ {% extends "base.html" %} {% block content %} -
-
-

Tasks

-

Immutable tasks derived from chat activity.

-
- Task Settings -
-
-
-
-
-

Projects

- {{ projects|length }} -
-

Projects are created automatically from chat usage. Use this panel for manual cleanup and mapping.

-
- {% if show_empty_projects %} - Hide empty projects - {% else %} - Show empty projects - {% endif %} -
-
- {% csrf_token %} - - - - -
-
- -
-
- -
+
+
+

Task Inbox

+

Immutable tasks derived from chat activity.

+
+ Task Automation +
+
+
+
+
+

Projects

+ {{ projects|length }}
- - - {% if scope.person %} -
-
- Setup scope: {{ scope.person.name }} - {% if scope.service and scope.identifier %} - · {{ scope.service }} · {{ scope.identifier }} - {% endif %} +

Projects are created automatically from chat usage. Use this panel for manual cleanup and mapping.

+
+ {% if show_empty_projects %} + Hide empty projects + {% else %} + Show empty projects + {% endif %} +
+
+ {% csrf_token %} + + + + +
+
+ +
+
+ +
-
-
- - - - - -
-
-
- + + + {% if scope.person %} +
+
+ Setup scope: {{ scope.person.name }} + {% if scope.service and scope.identifier %} + · {{ scope.service }} · {{ scope.identifier }} + {% endif %} +
+
+
+ +
+ + + +
+
+
+ +
+
+
+
-
- -
-
- -
- - - - {% for row in person_identifier_rows %} - - - -
IdentifierService
{{ row.identifier }}{{ row.service }} - {% if selected_project %} - {% if row.mapped %} - Linked + + + + + + {% for row in person_identifier_rows %} + + + + + + {% empty %} + + {% endfor %} + +
IdentifierService
{{ row.identifier }}{{ row.service }} + {% if selected_project %} + {% if row.mapped %} + Linked + {% else %} +
+ {% csrf_token %} + + + + + + + +
+ {% endif %} {% else %} -
- {% csrf_token %} - - - - - - - -
+ Select project {% endif %} - {% else %} - Select project +
No linked identifiers for this person yet.
+ {% else %} +

+ Open this page from Compose to map a person’s linked identifiers in one click. +

+ {% endif %} + + + + + {% for project in projects %} + + + + + + {% empty %} + + {% endfor %} + +
ProjectStats
+ {{ project.name }} + + {{ project.task_count }} task{{ project.task_count|pluralize }} + {{ project.epic_count }} epic{{ project.epic_count|pluralize }} + +
+ {% csrf_token %} + + + + +
+
No projects yet.
+ + +
+
+

Recent Derived Tasks

+ + + + {% for row in tasks %} + + + + + + + {% empty %} - + {% endfor %}
RefTitleCreated ByProjectStatusActions
#{{ row.reference_code }}{{ row.title }} + {{ row.creator_label|default:"Unknown" }} + {% if row.creator_identifier %} +
{{ row.creator_identifier }}
+ {% endif %} + 		{{ row.project.name }}{% if row.epic %} / {{ row.epic.name }}{% endif %}{{ row.status_snapshot }} + Open + {% if enabled_providers|length == 1 %} +
+ {% csrf_token %} + + + + +
+ {% elif enabled_providers %} +
+ {% csrf_token %} + + +
+
+
+ +
+
+
+ +
+
+
{% endif %}
No linked identifiers for this person yet.
No derived tasks yet.
- {% else %} -

- Open this page from Compose to map a person’s linked identifiers in one click. -

- {% endif %} - - - - - {% for project in projects %} - - - - - - {% empty %} - - {% endfor %} - -
ProjectStats
- {{ project.name }} - - {{ project.task_count }} task{{ project.task_count|pluralize }} - {{ project.epic_count }} epic{{ project.epic_count|pluralize }} - -
- {% csrf_token %} - - - - -
-
No projects yet.
-
-
-
-
-

Recent Derived Tasks

- - - - {% for row in tasks %} - - - - - - - - - {% empty %} - - {% endfor %} - -
RefTitleCreated ByProjectStatusActions
#{{ row.reference_code }}{{ row.title }} - {{ row.creator_label|default:"Unknown" }} - {% if row.creator_identifier %} -
{{ row.creator_identifier }}
- {% endif %} - 		{{ row.project.name }}{% if row.epic %} / {{ row.epic.name }}{% endif %}{{ row.status_snapshot }} - Open - {% if enabled_providers|length == 1 %} -
- {% csrf_token %} - - - - -
- {% elif enabled_providers %} -
- {% csrf_token %} - - -
-
-
- -
-
-
- -
-
-
- {% endif %} -
No derived tasks yet.
-
+ +
- - + {% endblock %} diff --git a/core/templates/pages/tasks-project.html b/core/templates/pages/tasks-project.html index 9432dfd..024a188 100644 --- a/core/templates/pages/tasks-project.html +++ b/core/templates/pages/tasks-project.html @@ -1,97 +1,97 @@ {% extends "base.html" %} {% block content %} -
-
-

Project: {{ project.name }}

-
- Back -
- {% csrf_token %} - - - -
-
- -
-
-

Epics

- {{ epics|length }} +
+
+

Project: {{ project.name }}

+
+ Back +
+ {% csrf_token %} + + + +
-
- {% csrf_token %} - -
-
- -
-
- -
-
-
- - - - {% for epic in epics %} - - - - - - {% empty %} - - {% endfor %} - -
EpicTasks
{{ epic.name }}{{ epic.task_count }} -
- {% csrf_token %} - - - -
-
No epics.
-
-
-

Tasks

- - - - {% for row in tasks %} - - - - - - - - {% empty %} - - {% endfor %} - -
RefTitleCreated ByEpic
#{{ row.reference_code }}{{ row.title }} - {{ row.creator_label|default:"Unknown" }} - {% if row.creator_compose_href %} - - {% endif %} - -
- {% csrf_token %} - - -
- -
- -
- 		Open
No tasks.
-
-
-
+
+
+

Epics

+ {{ epics|length }} +
+
+ {% csrf_token %} + +
+
+ +
+
+ +
+
+
+ + + + {% for epic in epics %} + + + + + + {% empty %} + + {% endfor %} + +
EpicTasks
{{ epic.name }}{{ epic.task_count }} +
+ {% csrf_token %} + + + +
+
No epics.
+
+ +
+

Tasks

+ + + + {% for row in tasks %} + + + + + + + + {% empty %} + + {% endfor %} + +
RefTitleCreated ByEpic
#{{ row.reference_code }}{{ row.title }} + {{ row.creator_label|default:"Unknown" }} + {% if row.creator_compose_href %} + + {% endif %} + +
+ {% csrf_token %} + + +
+ +
+ +
+ 		Open
No tasks.
+
+ + {% endblock %} diff --git a/core/templates/pages/tasks-settings.html b/core/templates/pages/tasks-settings.html index 5b70b46..504b44c 100644 --- a/core/templates/pages/tasks-settings.html +++ b/core/templates/pages/tasks-settings.html @@ -1,683 +1,683 @@ {% extends "base.html" %} {% block content %} -
-
-

Task Settings

-

Project defaults flow into channel overrides. Use Quick Setup for normal operation; open Advanced Setup for full controls.

+
+
+

Task Automation

+

Project defaults flow into channel overrides. Use Quick Setup for normal operation; open Advanced Setup for full controls.

-
-
-

How Matching Works

-

Safe default behavior: strict matching, required prefixes, completion parsing enabled, and task-id announcements disabled.

-

Hierarchy: Project flags are defaults. A mapped channel can override those defaults without changing project-wide behavior.

-

Matching modes: strict (prefix only), balanced (prefix + limited hints), broad (more permissive, higher false-positive risk).

+
+
+

How Matching Works

+

Safe default behavior: strict matching, required prefixes, completion parsing enabled, and task-id announcements disabled.

+

Hierarchy: Project flags are defaults. A mapped channel can override those defaults without changing project-wide behavior.

+

Matching modes: strict (prefix only), balanced (prefix + limited hints), broad (more permissive, higher false-positive risk).

+
-
-
-

Quick Setup

-

Creates or updates project + optional epic + channel mapping in one submission.

-

After setup, view tasks in Tasks Hub{% if prefill_service and prefill_identifier %} or this group task view{% endif %}.

-
- {% csrf_token %} - -
-
- -
- +
+

Quick Setup

+

Creates or updates project + optional epic + channel mapping in one submission.

+

After setup, view tasks in Task Inbox{% if prefill_service and prefill_identifier %} or this group task view{% endif %}.

+ + {% csrf_token %} + +
+
+ +
+ +
+

Platform to watch for task extraction.

-

Platform to watch for task extraction.

-
-
- - -

Exact chat/group id where messages are monitored.

-
-
- - -

Top-level container for derived tasks.

-
-
- - -

Optional sub-container within a project.

-
-
- -
-
- -
- +
+ + +

Exact chat/group id where messages are monitored.

+
+
+ + +

Top-level container for derived tasks.

+
+
+ + +

Optional sub-container within a project.

-

strict = safest, balanced = moderate, broad = permissive.

-
- - -

Click to add: - - - -

+ +
+
+ +
+ +
+

strict = safest, balanced = moderate, broad = permissive.

+
+
+ + +

Click to add: + + + +

+
+
+ + +

Minimum length after prefix.

+
-
- - -

Minimum length after prefix.

+ +
+ + + + +
-
+

+ Require Prefix: only prefixed messages can create tasks. + Derivation Enabled: master on/off for extraction. + Completion Enabled: parse completion phrases like done #12. + AI Title Enabled: normalize task titles using AI. + Announce Task ID: send bot confirmation on creation. +

-
- - - - - -
-

- Require Prefix: only prefixed messages can create tasks. - Derivation Enabled: master on/off for extraction. - Completion Enabled: parse completion phrases like done #12. - AI Title Enabled: normalize task titles using AI. - Announce Task ID: send bot confirmation on creation. -

+ + +
- - -
+
+ Advanced Setup +

Manual controls for creating hierarchy entities, mapping channels, and overriding behavior.

-
- Advanced Setup -

Manual controls for creating hierarchy entities, mapping channels, and overriding behavior.

- -
-
-
-

Projects

-

Create projects and review their effective defaults.

-
- {% csrf_token %} - -
-
-
-
-

Project names should describe a long-running stream of work.

-
- - - - {% for row in projects %} - - - - - {% empty %} - - {% endfor %} - -
ProjectDefaults
{{ row.name }}mode={{ row.settings_effective.match_mode }}, prefixes={{ row.allowed_prefixes_csv }}, announce_id={{ row.settings_effective.announce_task_id }}
No projects.
-
-
- -
-
-

Epics

-

Epics are optional subdivisions under a project.

-
- {% csrf_token %} - -
- -
-
-
-
- -
+
+
+
+

Projects

+

Create projects and review their effective defaults.

+ + {% csrf_token %} + +
+
+
-
-
-
-

Choose the parent project first, then add the epic name.

- -
-
- -
-
-

Group Mapping

-

Map a channel to a project/epic. Channel flags can later override project defaults.

-
- {% csrf_token %} - -
-
-
- -
-
-
-

Service/platform for this mapping.

-
-
-
-
- -
- -
-

Exact identifier for the chat/group.

-
-
-
-
- -
-
-
-

Project receiving derived tasks.

-
-
-
-
- -
-
-
-

Optional epic within that project.

-
-
-
-
-
- - - - {% for row in sources %} - - - - - - - - - {% empty %} - - {% endfor %} - -
ChatProjectEpicMatchAnnounce
{{ row.service }} · {{ row.channel_identifier }}{{ row.project.name }}{{ row.epic.name }}{{ row.settings_effective.match_mode }}{% if row.settings_effective.require_prefix %} +prefix{% endif %}{{ row.settings_effective.announce_task_id }} -
- {% csrf_token %} - - - -
-
No mappings.
-
-
- -
-
-

Project Defaults (All Mapped Chats)

-

Set baseline extraction behavior for a project. Every mapped chat inherits this unless overridden below.

-
- {% csrf_token %} - -
-
-
-
-
- - - - -
-

- - - -

- -
-

- Require Prefix: allow task creation only with configured prefixes. - Derivation Enabled: turn extraction on/off for this project. - Completion Enabled: enable completion phrase parser. - Announce Task ID: emit confirmation messages on task creation. -

-
-
- -
-
-

Channel Override Flags

-

Channel-level override. Use only where this chat should behave differently from the project default.

-
- {% csrf_token %} - -
-
-
-
-
- - - - - -
-

- - - -

- -
-

- Require Prefix: enforce prefixes in this channel. - Derivation Enabled: extraction on/off for this channel only. - Completion Enabled: completion phrase parser in this channel. - AI Title Enabled: AI title normalization in this channel. - Announce Task ID: confirmation message in this channel. -

-
-
- -
-
-

Completion Phrases

-

Add parser phrases for completion statements followed by a task reference, e.g. done #12.

-
- {% csrf_token %} - -
-
-
-
-
-
    {% for row in patterns %}
  • {{ row.phrase }}
    • {% empty %}
  • No phrases.
    • {% endfor %}
-
-
- -
-
-

Providers

-

Controls outbound sync to external tracking systems. If disabled, tasks are still derived and visible inside GIA only.

-
- {% csrf_token %} - - - -

Mock provider logs sync events without writing to a real third-party system.

-
- -
-
-
-
- {% csrf_token %} - - - -

Codex task-sync runs in a dedicated worker (python manage.py codex_worker).

-

This provider config is global per-user and shared across all projects/chats. This phase is task-sync only (no full transcript mirroring by default).

-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - Open Codex Status -
-
-
-
-

Codex Compact Summary

-

- Health: - {% if codex_compact_summary.healthcheck_ok %} - online - {% else %} - offline - {% endif %} - {% if codex_compact_summary.healthcheck_error %} - {{ codex_compact_summary.healthcheck_error }} - {% endif %} -

-

- Worker heartbeat: - {% if codex_compact_summary.worker_heartbeat_at %} - {{ codex_compact_summary.worker_heartbeat_at }} ({{ codex_compact_summary.worker_heartbeat_age }}) - {% else %} - no worker activity yet - {% endif %} -

-
- pending {{ codex_compact_summary.queue_counts.pending }} - waiting_approval {{ codex_compact_summary.queue_counts.waiting_approval }} - failed {{ codex_compact_summary.queue_counts.failed }} - ok {{ codex_compact_summary.queue_counts.ok }} -
- - +

Project names should describe a long-running stream of work.

+ +
WhenStatusTaskSummary
+ - {% for run in codex_compact_summary.recent_runs %} + {% for row in projects %} - - - - + + {% empty %} - + {% endfor %}
ProjectDefaults
{{ run.created_at }}{{ run.status }}{% if run.task %}#{{ run.task.reference_code }}{% else %}-{% endif %}{{ run.result_payload.summary|default:"-" }}{{ row.name }}mode={{ row.settings_effective.match_mode }}, prefixes={{ row.allowed_prefixes_csv }}, announce_id={{ row.settings_effective.announce_task_id }}
No runs yet.
No projects.
-
-
-
- {% csrf_token %} - - - -

Claude task-sync runs in the same dedicated worker (python manage.py codex_worker).

-

This provider config is global per-user and shared across all projects/chats.

-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- -
-
-
-
-

Claude Compact Summary

+
+
+ +
+
+

Epics

+

Epics are optional subdivisions under a project.

+
+ {% csrf_token %} + +
+ +
+
+
+
+ +
+
+
+
+
+

Choose the parent project first, then add the epic name.

+
+
+
+ +
+
+

Group Mapping

+

Map a channel to a project/epic. Channel flags can later override project defaults.

+
+ {% csrf_token %} + +
+
+
+ +
+
+
+

Service/platform for this mapping.

+
+
+
+
+ +
+ +
+

Exact identifier for the chat/group.

+
+
+
+
+ +
+
+
+

Project receiving derived tasks.

+
+
+
+
+ +
+
+
+

Optional epic within that project.

+
+
+
+
+
+ + + + {% for row in sources %} + + + + + + + + + {% empty %} + + {% endfor %} + +
ChatProjectEpicMatchAnnounce
{{ row.service }} · {{ row.channel_identifier }}{{ row.project.name }}{{ row.epic.name }}{{ row.settings_effective.match_mode }}{% if row.settings_effective.require_prefix %} +prefix{% endif %}{{ row.settings_effective.announce_task_id }} +
+ {% csrf_token %} + + + +
+
No mappings.
+
+
+ +
+
+

Project Defaults (All Mapped Chats)

+

Set baseline extraction behavior for a project. Every mapped chat inherits this unless overridden below.

+
+ {% csrf_token %} + +
+
+
+
+
+ + + + +
+

+ + + +

+ +

- Health: - {% if claude_compact_summary.healthcheck_ok %} - online - {% else %} - offline - {% endif %} - {% if claude_compact_summary.healthcheck_error %} - {{ claude_compact_summary.healthcheck_error }} - {% endif %} + Require Prefix: allow task creation only with configured prefixes. + Derivation Enabled: turn extraction on/off for this project. + Completion Enabled: enable completion phrase parser. + Announce Task ID: emit confirmation messages on task creation.

-
- pending {{ claude_compact_summary.queue_counts.pending }} - waiting_approval {{ claude_compact_summary.queue_counts.waiting_approval }} - failed {{ claude_compact_summary.queue_counts.failed }} - ok {{ claude_compact_summary.queue_counts.ok }} -
- -

Browse all derived tasks in Tasks Hub.

-
-
-
-
-

External Chat Links

-

Map one GIA contact to one Codex thread for task-sync routing.

-
- More info +
+
+ +
+
+

Channel Override Flags

+

Channel-level override. Use only where this chat should behave differently from the project default.

+
+ {% csrf_token %} + +
+
+
+
+
+ + + + + +
+

+ + + +

+ +

- This is task-sync only. It does not mirror full chat history. The link tells the Codex worker which Codex conversation/session should receive updates for tasks from that contact/group. + Require Prefix: enforce prefixes in this channel. + Derivation Enabled: extraction on/off for this channel only. + Completion Enabled: completion phrase parser in this channel. + AI Title Enabled: AI title normalization in this channel. + Announce Task ID: confirmation message in this channel.

-
- {% if external_link_scoped %} -
-
- Scoped to {{ external_link_scope_label }}. Only matching identifiers are available below. +
+ + +
+
+

Completion Phrases

+

Add parser phrases for completion statements followed by a task reference, e.g. done #12.

+
+ {% csrf_token %} + +
+
+
+
+
+
    {% for row in patterns %}
  • {{ row.phrase }}
    • {% empty %}
  • No phrases.
    • {% endfor %}
+
+
+ +
+
+

Providers

+

Controls outbound sync to external tracking systems. If disabled, tasks are still derived and visible inside GIA only.

+
+ {% csrf_token %} + + + +

Mock provider logs sync events without writing to a real third-party system.

+
+ +
+
+
+
+ {% csrf_token %} + + + +

Codex task-sync runs in a dedicated worker (python manage.py codex_worker).

+

This provider config is global per-user and shared across all projects/chats. This phase is task-sync only (no full transcript mirroring by default).

+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + Open Codex Status +
+
+
+
+

Codex Compact Summary

+

+ Health: + {% if codex_compact_summary.healthcheck_ok %} + online + {% else %} + offline + {% endif %} + {% if codex_compact_summary.healthcheck_error %} + {{ codex_compact_summary.healthcheck_error }} + {% endif %} +

+

+ Worker heartbeat: + {% if codex_compact_summary.worker_heartbeat_at %} + {{ codex_compact_summary.worker_heartbeat_at }} ({{ codex_compact_summary.worker_heartbeat_age }}) + {% else %} + no worker activity yet + {% endif %} +

+
+ pending {{ codex_compact_summary.queue_counts.pending }} + waiting_approval {{ codex_compact_summary.queue_counts.waiting_approval }} + failed {{ codex_compact_summary.queue_counts.failed }} + ok {{ codex_compact_summary.queue_counts.ok }} +
+ + + + {% for run in codex_compact_summary.recent_runs %} + + + + + + + {% empty %} + + {% endfor %} + +
WhenStatusTaskSummary
{{ run.created_at }}{{ run.status }}{% if run.task %}#{{ run.task.reference_code }}{% else %}-{% endif %}{{ run.result_payload.summary|default:"-" }}
No runs yet.
+
+
+
+ {% csrf_token %} + + + +

Claude task-sync runs in the same dedicated worker (python manage.py codex_worker).

+

This provider config is global per-user and shared across all projects/chats.

+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+
+
+

Claude Compact Summary

+

+ Health: + {% if claude_compact_summary.healthcheck_ok %} + online + {% else %} + offline + {% endif %} + {% if claude_compact_summary.healthcheck_error %} + {{ claude_compact_summary.healthcheck_error }} + {% endif %} +

+
+ pending {{ claude_compact_summary.queue_counts.pending }} + waiting_approval {{ claude_compact_summary.queue_counts.waiting_approval }} + failed {{ claude_compact_summary.queue_counts.failed }} + ok {{ claude_compact_summary.queue_counts.ok }}
- {% endif %} -
- {% csrf_token %} - - - -
-
-
- -
-
- +

Browse all derived tasks in Task Inbox.

+
+
+
+
+

External Chat Links

+

Map one GIA contact to one Codex thread for task-sync routing.

+
+ More info +

+ This is task-sync only. It does not mirror full chat history. The link tells the Codex worker which Codex conversation/session should receive updates for tasks from that contact/group. +

+
+ {% if external_link_scoped %} +
+
+ Scoped to {{ external_link_scope_label }}. Only matching identifiers are available below. +
+
+ {% endif %} + + {% csrf_token %} + + + +
+
+
+ +
+
+ +
-
-
-
- -
-
- +
+
+ +
+
+ +
+

Which GIA contact/group this link belongs to.

-

Which GIA contact/group this link belongs to.

-
-
-
- -
- +
+
+ +
+ +
+

Stable Codex conversation/session ID.

+
+
+
+
+ +
-

Stable Codex conversation/session ID.

-
-
- - +
+
+
-
-
-
- -
-
- - - - - {% for row in external_chat_links %} - - - - - - - - - {% empty %} - - {% endfor %} - -
ProviderPersonIdentifierExternal ChatEnabled
{{ row.provider }}{% if row.person %}{{ row.person.name }}{% else %}-{% endif %}{% if row.person_identifier %}{{ row.person_identifier.service }} · {{ row.person_identifier.identifier }}{% else %}-{% endif %}{{ row.external_chat_id }}{{ row.enabled }} -
- {% csrf_token %} - - - -
-
No external chat links.
-
+ + + + + {% for row in external_chat_links %} + + + + + + + + + {% empty %} + + {% endfor %} + +
ProviderPersonIdentifierExternal ChatEnabled
{{ row.provider }}{% if row.person %}{{ row.person.name }}{% else %}-{% endif %}{% if row.person_identifier %}{{ row.person_identifier.service }} · {{ row.person_identifier.identifier }}{% else %}-{% endif %}{{ row.external_chat_id }}{{ row.enabled }} +
+ {% csrf_token %} + + + +
+
No external chat links.
+ +
- - - - + + + - - - + })(); + {% endblock %} diff --git a/core/templates/partials/ai-workspace-ai-result.html b/core/templates/partials/ai-workspace-ai-result.html index 63ba80b..93828a4 100644 --- a/core/templates/partials/ai-workspace-ai-result.html +++ b/core/templates/partials/ai-workspace-ai-result.html @@ -129,7 +129,7 @@ class="button is-small is-info is-light" onclick="giaWorkspaceQueueSelectedDraft('{{ person.id }}'); return false;"> - Add To Queue + Queue For Approval @@ -399,8 +399,8 @@ return String(value || "") .split(",") .map(function (item) { - return item.trim(); - }) + return item.trim(); + }) .filter(Boolean); }; diff --git a/core/templates/partials/ai-workspace-mitigation-panel.html b/core/templates/partials/ai-workspace-mitigation-panel.html index 6608161..a3b5d89 100644 --- a/core/templates/partials/ai-workspace-mitigation-panel.html +++ b/core/templates/partials/ai-workspace-mitigation-panel.html @@ -475,7 +475,7 @@ @@ -867,35 +867,35 @@ }; defineGlobal("giaMitigationToggleEdit", function(button) { - const form = button && button.closest ? button.closest("form") : null; - if (!form) return; - const editing = button.dataset.editState === "edit"; - if (!editing) { - form.querySelectorAll('[data-editable="1"]').forEach(function(field) { field.removeAttribute("readonly"); }); - form.querySelectorAll('[data-editable-toggle="1"]').forEach(function(field) { field.removeAttribute("disabled"); }); - const card = form.closest(".mitigation-artifact-card"); - if (card) card.classList.add("is-editing"); - button.dataset.editState = "edit"; - button.classList.remove("is-light"); - button.title = "Save"; - button.innerHTML = ''; - resizeEditableTextareas(form); - return; - } - form.requestSubmit(); + const form = button && button.closest ? button.closest("form") : null; + if (!form) return; + const editing = button.dataset.editState === "edit"; + if (!editing) { + form.querySelectorAll('[data-editable="1"]').forEach(function(field) { field.removeAttribute("readonly"); }); + form.querySelectorAll('[data-editable-toggle="1"]').forEach(function(field) { field.removeAttribute("disabled"); }); + const card = form.closest(".mitigation-artifact-card"); + if (card) card.classList.add("is-editing"); + button.dataset.editState = "edit"; + button.classList.remove("is-light"); + button.title = "Save"; + button.innerHTML = ''; + resizeEditableTextareas(form); + return; + } + form.requestSubmit(); }); defineGlobal("giaEngageSetAction", function(pid, action) { - const actionInput = document.getElementById("engage-action-input-" + pid); - if (actionInput) actionInput.value = action; - if (action === "send") window.giaEngageSyncSendOverride(pid); + const actionInput = document.getElementById("engage-action-input-" + pid); + if (actionInput) actionInput.value = action; + if (action === "send") window.giaEngageSyncSendOverride(pid); }); defineGlobal("giaEngageAutoPreview", function(pid) { - const form = document.getElementById("engage-form-" + pid); - if (!form) return; - window.giaEngageSetAction(pid, "preview"); - form.requestSubmit(); + const form = document.getElementById("engage-form-" + pid); + if (!form) return; + window.giaEngageSetAction(pid, "preview"); + form.requestSubmit(); }); window.giaEngageSetTarget = function(pid, targetId) { @@ -908,14 +908,14 @@ }; defineGlobal("giaEngageSelect", function(pid, kind, value, node) { - const inputId = kind === "share" ? ("engage-share-input-" + pid) : (kind === "framing" ? ("engage-framing-input-" + pid) : ""); - const input = inputId ? document.getElementById(inputId) : null; - if (input) input.value = value; - const li = node && node.closest ? node.closest("li") : null; - if (!li || !li.parentElement) return; - Array.from(li.parentElement.children).forEach(function(child) { child.classList.remove("is-active"); }); - li.classList.add("is-active"); - window.giaEngageAutoPreview(pid); + const inputId = kind === "share" ? ("engage-share-input-" + pid) : (kind === "framing" ? ("engage-framing-input-" + pid) : ""); + const input = inputId ? document.getElementById(inputId) : null; + if (input) input.value = value; + const li = node && node.closest ? node.closest("li") : null; + if (!li || !li.parentElement) return; + Array.from(li.parentElement.children).forEach(function(child) { child.classList.remove("is-active"); }); + li.classList.add("is-active"); + window.giaEngageAutoPreview(pid); }); window.giaMitigationShowTab(personId, "{{ active_tab|default:'plan_board' }}"); diff --git a/core/templates/partials/ai-workspace-person-widget.html b/core/templates/partials/ai-workspace-person-widget.html index 34fe65c..1635f06 100644 --- a/core/templates/partials/ai-workspace-person-widget.html +++ b/core/templates/partials/ai-workspace-person-widget.html @@ -536,8 +536,8 @@ showOperationPane(operation); const activeTab = tabKey || ( operation === "artifacts" - ? ((window.giaWorkspaceState[personId] || {}).currentMitigationTab || "plan_board") - : operation + ? ((window.giaWorkspaceState[personId] || {}).currentMitigationTab || "plan_board") + : operation ); setTopCapsuleActive(activeTab); const hydrated = hydrateCachedIfAvailable(operation); @@ -573,8 +573,8 @@ const currentState = window.giaWorkspaceState[personId] || {}; const targetTabKey = currentState.pendingTabKey || ( operation === "artifacts" - ? (currentState.currentMitigationTab || "plan_board") - : operation + ? (currentState.currentMitigationTab || "plan_board") + : operation ); if (!forceRefresh && currentState.current === operation && pane.dataset.loaded === "1") { window.giaWorkspaceShowTab(personId, operation, targetTabKey); @@ -622,38 +622,38 @@ fetch(url, { method: "GET" }) .then(function(resp) { return resp.text(); }) .then(function(html) { - pane.innerHTML = html; - pane.dataset.loaded = "1"; - executeInlineScripts(pane); - pane.classList.remove("ai-animate-in"); - void pane.offsetWidth; - pane.classList.add("ai-animate-in"); - if (cacheAllowed) { - window.giaWorkspaceCache[key] = { - html: html, - ts: Date.now(), - }; - persistCache(); - setCachedIndicator(true, window.giaWorkspaceCache[key].ts); - } else { - setCachedIndicator(false, null); - } - if (window.htmx) { - window.htmx.process(pane); - } - if (operation === "draft_reply" && typeof window.giaWorkspaceUseDraft === "function") { - window.giaWorkspaceUseDraft(personId, operation, 0); - } - if (operation === "artifacts") { - applyMitigationTabSelection(); - } - if (window.giaWorkspaceState[personId]) { - window.giaWorkspaceState[personId].pendingTabKey = ""; - } - }) + pane.innerHTML = html; + pane.dataset.loaded = "1"; + executeInlineScripts(pane); + pane.classList.remove("ai-animate-in"); + void pane.offsetWidth; + pane.classList.add("ai-animate-in"); + if (cacheAllowed) { + window.giaWorkspaceCache[key] = { + html: html, + ts: Date.now(), + }; + persistCache(); + setCachedIndicator(true, window.giaWorkspaceCache[key].ts); + } else { + setCachedIndicator(false, null); + } + if (window.htmx) { + window.htmx.process(pane); + } + if (operation === "draft_reply" && typeof window.giaWorkspaceUseDraft === "function") { + window.giaWorkspaceUseDraft(personId, operation, 0); + } + if (operation === "artifacts") { + applyMitigationTabSelection(); + } + if (window.giaWorkspaceState[personId]) { + window.giaWorkspaceState[personId].pendingTabKey = ""; + } + }) .catch(function() { - pane.innerHTML = '
Failed to load AI response.
'; - }); + pane.innerHTML = '
Failed to load AI response.
'; + }); }; window.giaWorkspaceRefresh = function(pid) { @@ -663,8 +663,8 @@ const state = window.giaWorkspaceState[personId] || {}; const currentTab = state.currentTab || ( state.current === "artifacts" - ? (state.currentMitigationTab || "plan_board") - : (state.current || "plan_board") + ? (state.currentMitigationTab || "plan_board") + : (state.current || "plan_board") ); window.giaWorkspaceOpenTab(personId, currentTab, true); }; @@ -754,15 +754,15 @@ }) .then(function(resp) { return resp.text(); }) .then(function(html) { - if (statusHost) { - statusHost.innerHTML = html; - } - }) + if (statusHost) { + statusHost.innerHTML = html; + } + }) .catch(function() { - if (statusHost) { - statusHost.innerHTML = '
Failed to queue draft.
'; - } - }); + if (statusHost) { + statusHost.innerHTML = '
Failed to queue draft.
'; + } + }); }; function getSelectedTargetId() { @@ -841,92 +841,92 @@ }; defineGlobal("giaMitigationShowTab", function(pid, tabName) { - const names = ["plan_board", "corrections", "engage", "fundamentals", "ask_ai"]; - names.forEach(function(name) { - const pane = document.getElementById("mitigation-tab-" + pid + "-" + name); - const tab = document.getElementById("mitigation-tab-btn-" + pid + "-" + name); - if (!pane) { - return; - } - const active = (name === tabName); - pane.style.display = active ? "block" : "none"; - if (tab) { - tab.classList.toggle("is-active", active); - } - }); - const shell = document.getElementById("mitigation-shell-" + pid); - if (!shell) { + const names = ["plan_board", "corrections", "engage", "fundamentals", "ask_ai"]; + names.forEach(function(name) { + const pane = document.getElementById("mitigation-tab-" + pid + "-" + name); + const tab = document.getElementById("mitigation-tab-btn-" + pid + "-" + name); + if (!pane) { return; } - shell.querySelectorAll('input[name="active_tab"]').forEach(function(input) { - input.value = tabName; - }); + const active = (name === tabName); + pane.style.display = active ? "block" : "none"; + if (tab) { + tab.classList.toggle("is-active", active); + } }); + const shell = document.getElementById("mitigation-shell-" + pid); + if (!shell) { + return; + } + shell.querySelectorAll('input[name="active_tab"]').forEach(function(input) { + input.value = tabName; + }); + }); defineGlobal("giaMitigationToggleEdit", function(button) { - const form = button ? button.closest("form") : null; - if (!form) { - return; + const form = button ? button.closest("form") : null; + if (!form) { + return; + } + const card = form.closest(".mitigation-artifact-card"); + const editing = button.dataset.editState === "edit"; + const fields = form.querySelectorAll('[data-editable="1"]'); + const toggles = form.querySelectorAll('[data-editable-toggle="1"]'); + if (!editing) { + fields.forEach(function(field) { + field.removeAttribute("readonly"); + }); + toggles.forEach(function(field) { + field.removeAttribute("disabled"); + }); + if (card) { + card.classList.add("is-editing"); } - const card = form.closest(".mitigation-artifact-card"); - const editing = button.dataset.editState === "edit"; - const fields = form.querySelectorAll('[data-editable="1"]'); - const toggles = form.querySelectorAll('[data-editable-toggle="1"]'); - if (!editing) { - fields.forEach(function(field) { - field.removeAttribute("readonly"); - }); - toggles.forEach(function(field) { - field.removeAttribute("disabled"); - }); - if (card) { - card.classList.add("is-editing"); - } - button.dataset.editState = "edit"; - button.classList.remove("is-light"); - button.title = "Save"; - button.innerHTML = ''; - } else { - form.requestSubmit(); - } - }); + button.dataset.editState = "edit"; + button.classList.remove("is-light"); + button.title = "Save"; + button.innerHTML = ''; + } else { + form.requestSubmit(); + } + }); defineGlobal("giaEngageSetAction", function(pid, action) { - const actionInput = document.getElementById("engage-action-input-" + pid); - if (actionInput) { - actionInput.value = action; - } - }); + const actionInput = document.getElementById("engage-action-input-" + pid); + if (actionInput) { + actionInput.value = action; + } + }); defineGlobal("giaEngageAutoPreview", function(pid) { - const form = document.getElementById("engage-form-" + pid); - if (!form) { - return; - } - window.giaEngageSetAction(pid, "preview"); - form.requestSubmit(); - }); + const form = document.getElementById("engage-form-" + pid); + if (!form) { + return; + } + window.giaEngageSetAction(pid, "preview"); + form.requestSubmit(); + }); defineGlobal("giaEngageSelect", function(pid, kind, value, node) { - let inputId = ""; - if (kind === "share") { - inputId = "engage-share-input-" + pid; - } else if (kind === "framing") { - inputId = "engage-framing-input-" + pid; - } - const input = inputId ? document.getElementById(inputId) : null; - if (input) { - input.value = value; - } - const li = node && node.closest ? node.closest("li") : null; - if (li && li.parentElement) { - Array.from(li.parentElement.children).forEach(function(child) { - child.classList.remove("is-active"); - }); - li.classList.add("is-active"); - } - window.giaEngageAutoPreview(pid); - }); + let inputId = ""; + if (kind === "share") { + inputId = "engage-share-input-" + pid; + } else if (kind === "framing") { + inputId = "engage-framing-input-" + pid; + } + const input = inputId ? document.getElementById(inputId) : null; + if (input) { + input.value = value; + } + const li = node && node.closest ? node.closest("li") : null; + if (li && li.parentElement) { + Array.from(li.parentElement.children).forEach(function(child) { + child.classList.remove("is-active"); + }); + li.classList.add("is-active"); + } + window.giaEngageAutoPreview(pid); + }); window.giaWorkspaceOpenTab(personId, "plan_board", false); syncTargetInputs(); diff --git a/core/templates/partials/compose-panel.html b/core/templates/partials/compose-panel.html index 1142d65..b1e74dd 100644 --- a/core/templates/partials/compose-panel.html +++ b/core/templates/partials/compose-panel.html @@ -2323,8 +2323,8 @@ glanceState && glanceState.gap ? glanceState.gap.lag_ms : 0 ); const baselineMs = baselineFromGapMs > 0 - ? baselineFromGapMs - : toInt(snapshot.counterpartBaselineMs); + ? baselineFromGapMs + : toInt(snapshot.counterpartBaselineMs); if (!baselineMs) { replyTimingState = { sinceLabel: sinceLabel, @@ -2758,13 +2758,13 @@ const safe = Array.isArray(items) ? items.slice(0, 3) : []; const ordered = safe .filter(function (item) { - return /^delay$/i.test(String(item && item.label ? item.label : "")); - }) - .concat( - safe.filter(function (item) { - return !/^delay$/i.test(String(item && item.label ? item.label : "")); + return /^delay$/i.test(String(item && item.label ? item.label : "")); }) - ); + .concat( + safe.filter(function (item) { + return !/^delay$/i.test(String(item && item.label ? item.label : "")); + }) + ); glanceNode.innerHTML = ""; ordered.forEach(function (item) { const url = String(item.url || "").trim(); @@ -3326,11 +3326,11 @@ bubble.appendChild(blockGap); } const imageCandidatesFromPayload = Array.isArray(msg.image_urls) && msg.image_urls.length - ? msg.image_urls - : (msg.image_url ? [msg.image_url] : []); + ? msg.image_urls + : (msg.image_url ? [msg.image_url] : []); const imageCandidates = imageCandidatesFromPayload.length - ? imageCandidatesFromPayload - : extractUrlCandidates(msg.text || msg.display_text || ""); + ? imageCandidatesFromPayload + : extractUrlCandidates(msg.text || msg.display_text || ""); appendImageCandidates(bubble, imageCandidates); if (!msg.hide_text) { @@ -3376,8 +3376,8 @@ const deletedFlag = document.createElement("span"); deletedFlag.className = "compose-msg-flag is-deleted"; deletedFlag.title = "Deleted" - + (msg.deleted_display ? (" at " + String(msg.deleted_display)) : "") - + (msg.deleted_actor ? (" by " + String(msg.deleted_actor)) : ""); + + (msg.deleted_display ? (" at " + String(msg.deleted_display)) : "") + + (msg.deleted_actor ? (" by " + String(msg.deleted_actor)) : ""); deletedFlag.textContent = "deleted"; meta.appendChild(deletedFlag); } @@ -5184,7 +5184,7 @@ } catch (err) { setCardLoading(card, false); card.querySelector(".compose-ai-content").textContent = - "Failed to load quick insights."; + "Failed to load quick insights."; } }; @@ -5203,8 +5203,8 @@ const customText = card.querySelector(".engage-custom-text"); const selectedSource = ( preferredSource !== undefined - ? preferredSource - : (sourceSelect ? sourceSelect.value : "") + ? preferredSource + : (sourceSelect ? sourceSelect.value : "") ); const customValue = customText ? String(customText.value || "").trim() : ""; const showCustom = selectedSource === "custom"; @@ -5382,8 +5382,8 @@ const selectedPerson = selected.dataset.person || thread.dataset.person || ""; const selectedPageUrl = ( renderMode === "page" - ? selected.dataset.pageUrl - : selected.dataset.widgetUrl + ? selected.dataset.pageUrl + : selected.dataset.widgetUrl ) || ""; switchThreadContext( selectedService, @@ -5412,8 +5412,8 @@ const selectedPerson = selected.dataset.person || ""; let selectedPageUrl = ( renderMode === "page" - ? selected.dataset[servicePageUrlKey] - : selected.dataset[serviceWidgetUrlKey] + ? selected.dataset[servicePageUrlKey] + : selected.dataset[serviceWidgetUrlKey] ) || ""; if (!selectedIdentifier) { selectedService = selected.dataset.service || selectedService; @@ -5422,8 +5422,8 @@ if (!selectedPageUrl) { selectedPageUrl = ( renderMode === "page" - ? selected.dataset.pageUrl - : selected.dataset.widgetUrl + ? selected.dataset.pageUrl + : selected.dataset.widgetUrl ) || ""; } switchThreadContext( diff --git a/core/templates/partials/compose-workspace-contacts-widget.html b/core/templates/partials/compose-workspace-contacts-widget.html index d04db71..4a5d745 100644 --- a/core/templates/partials/compose-workspace-contacts-widget.html +++ b/core/templates/partials/compose-workspace-contacts-widget.html @@ -3,10 +3,10 @@
+ margin-bottom: 0.75rem; + padding: 0.5rem 0.25rem; + border-bottom: 1px solid rgba(0, 0, 0, 0.12); + ">

Manual Workspace

Choose A Contact

@@ -17,10 +17,10 @@

+ margin-bottom: 0.75rem; + padding: 0.5rem 0.25rem; + border-bottom: 1px solid rgba(0, 0, 0, 0.12); + ">
- - - - - - - - - - {% for item in object_list %} - - - - - - - -
numberuuidaccountnamepersonavailabilityactions
{% if item.chat %}{{ item.chat.source_number }}{% endif %} - {% if item.chat %} - - - - - - {% endif %} - {% if item.chat %}{{ item.chat.account }}{% endif %} - {% if item.is_group %} - - {% endif %} - {% if item.chat %}{{ item.chat.source_name }}{% else %}{{ item.name }}{% endif %} - {{ item.person_name|default:"-" }} - {% if item.availability_label %} - {{ item.availability_label }} - {% else %} - - - {% endif %} - -
- {% if not item.is_group %} -
diff --git a/core/templates/partials/whatsapp-account-add.html b/core/templates/partials/whatsapp-account-add.html index af1052a..aef3178 100644 --- a/core/templates/partials/whatsapp-account-add.html +++ b/core/templates/partials/whatsapp-account-add.html @@ -4,12 +4,12 @@ src="data:image/png;base64, {{ object.image_b64 }}" alt="WhatsApp QR code" style=" - display: block; - width: 100%; - max-width: 420px; - height: auto; - margin: 0 auto; - " /> + display: block; + width: 100%; + max-width: 420px; + height: auto; + margin: 0 auto; + " /> {% if object.warning %}

{{ object.warning }}

{% endif %} diff --git a/core/templates/two_factor/_wizard_actions.html b/core/templates/two_factor/_wizard_actions.html index 74cbe3d..c86f5a0 100644 --- a/core/templates/two_factor/_wizard_actions.html +++ b/core/templates/two_factor/_wizard_actions.html @@ -3,12 +3,12 @@
{% if cancel_url %} {% trans "Cancel" %} + class="button">{% trans "Cancel" %} {% endif %} {% if wizard.steps.prev %} + value="{{ wizard.steps.prev }}" + class="button">{% trans "Back" %} {% else %} {% endif %} diff --git a/core/templates/two_factor/core/backup_tokens.html b/core/templates/two_factor/core/backup_tokens.html index 955eb3b..8e7521d 100644 --- a/core/templates/two_factor/core/backup_tokens.html +++ b/core/templates/two_factor/core/backup_tokens.html @@ -22,7 +22,7 @@ {% csrf_token %}{{ form }} {% trans "Back to Account Security" %} + class="float-right button">{% trans "Back to Account Security" %} {% endblock %} diff --git a/core/templates/two_factor/core/login.html b/core/templates/two_factor/core/login.html index c36c03d..8edef8a 100644 --- a/core/templates/two_factor/core/login.html +++ b/core/templates/two_factor/core/login.html @@ -34,7 +34,7 @@

{% for other in other_devices %} {% endfor %}

@@ -43,7 +43,7 @@

{% trans "As a last resort, you can use a backup token:" %}

+ class="button">{% trans "Use Backup Token" %}

{% endif %} diff --git a/core/templates/two_factor/core/otp_required.html b/core/templates/two_factor/core/otp_required.html index e5b9e5b..8aff7d1 100644 --- a/core/templates/two_factor/core/otp_required.html +++ b/core/templates/two_factor/core/otp_required.html @@ -14,7 +14,7 @@
{% trans "Go back" %} + class="float-right button">{% trans "Go back" %} {% trans "Enable Two-Factor Authentication" %}
diff --git a/core/templates/two_factor/core/setup_complete.html b/core/templates/two_factor/core/setup_complete.html index f0f364e..93ddf5f 100644 --- a/core/templates/two_factor/core/setup_complete.html +++ b/core/templates/two_factor/core/setup_complete.html @@ -9,16 +9,16 @@ {% if not phone_methods %}

{% trans "Back to Account Security" %}

+ class="button">{% trans "Back to Account Security" %}

{% else %}

{% blocktrans trimmed %}However, it might happen that you don't have access to your primary token device. To enable account recovery, add a phone number.{% endblocktrans %}

{% trans "Back to Account Security" %} + class="float-right button">{% trans "Back to Account Security" %}

{% trans "Add Phone Number" %}

+ class="button">{% trans "Add Phone Number" %}

{% endif %} {% endblock %} diff --git a/core/templates/two_factor/profile/disable.html b/core/templates/two_factor/profile/disable.html index 2db864a..71c39cb 100644 --- a/core/templates/two_factor/profile/disable.html +++ b/core/templates/two_factor/profile/disable.html @@ -9,6 +9,6 @@ {% csrf_token %} {{ form }}
+ type="submit">{% trans "Disable" %} {% endblock %} diff --git a/core/templates/two_factor/profile/profile.html b/core/templates/two_factor/profile/profile.html index b509030..a20c19c 100644 --- a/core/templates/two_factor/profile/profile.html +++ b/core/templates/two_factor/profile/profile.html @@ -22,16 +22,16 @@
  • {{ phone.generate_challenge_button_title }}
    + onsubmit="return confirm({% trans 'Are you sure?' %})"> {% csrf_token %} + type="submit">{% trans "Unregister" %}
    • {% endfor %}

    {% trans "Add Phone Number" %}

    + class="button">{% trans "Add Phone Number" %}

    {% endif %}

    {% trans "Backup Tokens" %}

    @@ -45,7 +45,7 @@ {% endblocktrans %}

    {% trans "Show Codes" %}

    + class="button">{% trans "Show Codes" %}

    {% trans "Disable Two-Factor Authentication" %}

    {% blocktrans trimmed %}However we strongly discourage you to do so, you can diff --git a/core/tests/test_ai_run_log.py b/core/tests/test_ai_run_log.py index ca404d7..8ec9ba8 100644 --- a/core/tests/test_ai_run_log.py +++ b/core/tests/test_ai_run_log.py @@ -1,8 +1,9 @@ from __future__ import annotations +from unittest.mock import patch + from asgiref.sync import async_to_sync from django.test import TestCase -from unittest.mock import patch from core.messaging.ai import run_prompt from core.models import AI, AIRunLog, User diff --git a/core/tests/test_backfill_contact_availability.py b/core/tests/test_backfill_contact_availability.py index 2a37aa4..53defa1 100644 --- a/core/tests/test_backfill_contact_availability.py +++ b/core/tests/test_backfill_contact_availability.py @@ -6,9 +6,9 @@ from django.test import TestCase from core.models import ( ChatSession, ContactAvailabilityEvent, + Message, Person, PersonIdentifier, - Message, User, ) from core.presence.inference import now_ms @@ -16,7 +16,9 @@ from core.presence.inference import now_ms class BackfillContactAvailabilityCommandTests(TestCase): def setUp(self): - self.user = User.objects.create_user("backfill-user", "backfill@example.com", "x") + self.user = User.objects.create_user( + "backfill-user", "backfill@example.com", "x" + ) self.person = Person.objects.create(user=self.user, name="Backfill Person") self.identifier = PersonIdentifier.objects.create( user=self.user, @@ -24,7 +26,9 @@ class BackfillContactAvailabilityCommandTests(TestCase): service="signal", identifier="+15551234567", ) - self.session = ChatSession.objects.create(user=self.user, identifier=self.identifier) + self.session = ChatSession.objects.create( + user=self.user, identifier=self.identifier + ) def test_backfill_creates_message_and_read_receipt_availability_events(self): base_ts = now_ms() @@ -58,7 +62,9 @@ class BackfillContactAvailabilityCommandTests(TestCase): ) events = list( - ContactAvailabilityEvent.objects.filter(user=self.user).order_by("ts", "source_kind") + ContactAvailabilityEvent.objects.filter(user=self.user).order_by( + "ts", "source_kind" + ) ) self.assertEqual(3, len(events)) self.assertTrue(any(row.source_kind == "message_in" for row in events)) diff --git a/core/tests/test_bp_fallback.py b/core/tests/test_bp_fallback.py index 4dd333c..25445e4 100644 --- a/core/tests/test_bp_fallback.py +++ b/core/tests/test_bp_fallback.py @@ -123,7 +123,9 @@ class BPFallbackTests(TransactionTestCase): run = CommandRun.objects.get(trigger_message=trigger, profile=self.profile) self.assertEqual("failed", run.status) self.assertIn("bp_ai_failed", str(run.error)) - self.assertFalse(BusinessPlanDocument.objects.filter(trigger_message=trigger).exists()) + self.assertFalse( + BusinessPlanDocument.objects.filter(trigger_message=trigger).exists() + ) def test_bp_uses_same_ai_selection_order_as_compose(self): AI.objects.create( diff --git a/core/tests/test_bp_subcommands.py b/core/tests/test_bp_subcommands.py index 773ffc2..5f12c17 100644 --- a/core/tests/test_bp_subcommands.py +++ b/core/tests/test_bp_subcommands.py @@ -35,7 +35,9 @@ class BPSubcommandTests(TransactionTestCase): service="whatsapp", identifier="120363402761690215", ) - self.session = ChatSession.objects.create(user=self.user, identifier=self.identifier) + self.session = ChatSession.objects.create( + user=self.user, identifier=self.identifier + ) self.profile = CommandProfile.objects.create( user=self.user, slug="bp", @@ -96,13 +98,19 @@ class BPSubcommandTests(TransactionTestCase): source_service="whatsapp", source_chat_id="120363402761690215", ) - with patch("core.commands.handlers.bp.ai_runner.run_prompt", new=AsyncMock()) as mocked_ai: - result = async_to_sync(BPCommandHandler().execute)(self._ctx(trigger, trigger.text)) + with patch( + "core.commands.handlers.bp.ai_runner.run_prompt", new=AsyncMock() + ) as mocked_ai: + result = async_to_sync(BPCommandHandler().execute)( + self._ctx(trigger, trigger.text) + ) self.assertTrue(result.ok) mocked_ai.assert_not_awaited() doc = BusinessPlanDocument.objects.get(trigger_message=trigger) self.assertEqual("direct body", doc.content_markdown) - self.assertEqual("Generated from 1 message.", doc.structured_payload.get("annotation")) + self.assertEqual( + "Generated from 1 message.", doc.structured_payload.get("annotation") + ) def test_set_reply_only_uses_anchor(self): anchor = Message.objects.create( @@ -124,11 +132,15 @@ class BPSubcommandTests(TransactionTestCase): source_chat_id="120363402761690215", reply_to=anchor, ) - result = async_to_sync(BPCommandHandler().execute)(self._ctx(trigger, trigger.text)) + result = async_to_sync(BPCommandHandler().execute)( + self._ctx(trigger, trigger.text) + ) self.assertTrue(result.ok) doc = BusinessPlanDocument.objects.get(trigger_message=trigger) self.assertEqual("anchor body", doc.content_markdown) - self.assertEqual("Generated from 1 message.", doc.structured_payload.get("annotation")) + self.assertEqual( + "Generated from 1 message.", doc.structured_payload.get("annotation") + ) def test_set_reply_plus_addendum_uses_divider(self): anchor = Message.objects.create( @@ -150,7 +162,9 @@ class BPSubcommandTests(TransactionTestCase): source_chat_id="120363402761690215", reply_to=anchor, ) - result = async_to_sync(BPCommandHandler().execute)(self._ctx(trigger, trigger.text)) + result = async_to_sync(BPCommandHandler().execute)( + self._ctx(trigger, trigger.text) + ) self.assertTrue(result.ok) doc = BusinessPlanDocument.objects.get(trigger_message=trigger) self.assertIn("base body", doc.content_markdown) @@ -171,7 +185,9 @@ class BPSubcommandTests(TransactionTestCase): source_service="whatsapp", source_chat_id="120363402761690215", ) - result = async_to_sync(BPCommandHandler().execute)(self._ctx(trigger, trigger.text)) + result = async_to_sync(BPCommandHandler().execute)( + self._ctx(trigger, trigger.text) + ) self.assertFalse(result.ok) self.assertEqual("failed", result.status) self.assertEqual("bp_set_range_requires_reply_target", result.error) @@ -205,8 +221,12 @@ class BPSubcommandTests(TransactionTestCase): source_chat_id="120363402761690215", reply_to=anchor, ) - result = async_to_sync(BPCommandHandler().execute)(self._ctx(trigger, trigger.text)) + result = async_to_sync(BPCommandHandler().execute)( + self._ctx(trigger, trigger.text) + ) self.assertTrue(result.ok) doc = BusinessPlanDocument.objects.get(trigger_message=trigger) self.assertEqual("line 1\n(no text)\n#bp set range#", doc.content_markdown) - self.assertEqual("Generated from 3 messages.", doc.structured_payload.get("annotation")) + self.assertEqual( + "Generated from 3 messages.", doc.structured_payload.get("annotation") + ) diff --git a/core/tests/test_claude_cli_provider.py b/core/tests/test_claude_cli_provider.py index 43bc3ac..dcb4a40 100644 --- a/core/tests/test_claude_cli_provider.py +++ b/core/tests/test_claude_cli_provider.py @@ -55,7 +55,9 @@ class ClaudeCLITaskProviderTests(SimpleTestCase): @patch("core.tasks.providers.claude_cli.subprocess.run") def test_timeout_maps_to_failed_result(self, run_mock): run_mock.side_effect = TimeoutExpired(cmd=["claude"], timeout=10) - result = self.provider.append_update({"command": "claude", "timeout_seconds": 10}, {"task_id": "t1"}) + result = self.provider.append_update( + {"command": "claude", "timeout_seconds": 10}, {"task_id": "t1"} + ) self.assertFalse(result.ok) self.assertIn("timeout", result.error) @@ -70,7 +72,9 @@ class ClaudeCLITaskProviderTests(SimpleTestCase): result = self.provider.append_update({"command": "claude"}, {"task_id": "t1"}) self.assertTrue(result.ok) self.assertTrue(bool((result.payload or {}).get("requires_approval"))) - self.assertEqual("requires_approval", (result.payload or {}).get("parsed_status")) + self.assertEqual( + "requires_approval", (result.payload or {}).get("parsed_status") + ) @patch("core.tasks.providers.claude_cli.subprocess.run") def test_retries_with_positional_op_when_flag_unsupported(self, run_mock): @@ -99,7 +103,9 @@ class ClaudeCLITaskProviderTests(SimpleTestCase): self.assertEqual(["claude", "task-sync", "create"], second[:3]) @patch("core.tasks.providers.claude_cli.subprocess.run") - def test_falls_back_to_builtin_approval_stub_when_no_task_sync_contract(self, run_mock): + def test_falls_back_to_builtin_approval_stub_when_no_task_sync_contract( + self, run_mock + ): run_mock.side_effect = [ CompletedProcess( args=[], @@ -124,8 +130,13 @@ class ClaudeCLITaskProviderTests(SimpleTestCase): ) self.assertTrue(result.ok) self.assertTrue(bool((result.payload or {}).get("requires_approval"))) - self.assertEqual("requires_approval", str((result.payload or {}).get("status") or "")) - self.assertEqual("builtin_task_sync_stub", str((result.payload or {}).get("fallback_mode") or "")) + self.assertEqual( + "requires_approval", str((result.payload or {}).get("status") or "") + ) + self.assertEqual( + "builtin_task_sync_stub", + str((result.payload or {}).get("fallback_mode") or ""), + ) @patch("core.tasks.providers.claude_cli.subprocess.run") def test_builtin_stub_approval_response_returns_ok(self, run_mock): diff --git a/core/tests/test_claude_commands_phase1.py b/core/tests/test_claude_commands_phase1.py index 4f7dac0..45160c3 100644 --- a/core/tests/test_claude_commands_phase1.py +++ b/core/tests/test_claude_commands_phase1.py @@ -8,10 +8,10 @@ from core.commands.engine import process_inbound_message from core.commands.handlers.claude import parse_claude_command from core.models import ( ChatSession, - CommandChannelBinding, - CommandProfile, CodexPermissionRequest, CodexRun, + CommandChannelBinding, + CommandProfile, DerivedTask, ExternalSyncEvent, Message, @@ -45,7 +45,9 @@ class ClaudeCommandParserTests(TestCase): class ClaudeCommandExecutionTests(TestCase): def setUp(self): - self.user = User.objects.create_user("claude-cmd-user", "claude-cmd@example.com", "x") + self.user = User.objects.create_user( + "claude-cmd-user", "claude-cmd@example.com", "x" + ) self.person = Person.objects.create(user=self.user, name="Claude Cmd") self.identifier = PersonIdentifier.objects.create( user=self.user, @@ -53,7 +55,9 @@ class ClaudeCommandExecutionTests(TestCase): service="web", identifier="web-chan-1", ) - self.session = ChatSession.objects.create(user=self.user, identifier=self.identifier) + self.session = ChatSession.objects.create( + user=self.user, identifier=self.identifier + ) self.project = TaskProject.objects.create(user=self.user, name="Project A") self.task = DerivedTask.objects.create( user=self.user, @@ -202,7 +206,9 @@ class ClaudeCommandExecutionTests(TestCase): channel_identifier="approver-chan", enabled=True, ) - trigger = self._msg("#claude approve cl-ak-123#", source_chat_id="approver-chan") + trigger = self._msg( + "#claude approve cl-ak-123#", source_chat_id="approver-chan" + ) results = async_to_sync(process_inbound_message)( CommandContext( service="web", diff --git a/core/tests/test_codex_cli_provider.py b/core/tests/test_codex_cli_provider.py index c442d55..515bc9c 100644 --- a/core/tests/test_codex_cli_provider.py +++ b/core/tests/test_codex_cli_provider.py @@ -55,7 +55,9 @@ class CodexCLITaskProviderTests(SimpleTestCase): @patch("core.tasks.providers.codex_cli.subprocess.run") def test_timeout_maps_to_failed_result(self, run_mock): run_mock.side_effect = TimeoutExpired(cmd=["codex"], timeout=10) - result = self.provider.append_update({"command": "codex", "timeout_seconds": 10}, {"task_id": "t1"}) + result = self.provider.append_update( + {"command": "codex", "timeout_seconds": 10}, {"task_id": "t1"} + ) self.assertFalse(result.ok) self.assertIn("timeout", result.error) @@ -70,7 +72,9 @@ class CodexCLITaskProviderTests(SimpleTestCase): result = self.provider.append_update({"command": "codex"}, {"task_id": "t1"}) self.assertTrue(result.ok) self.assertTrue(bool((result.payload or {}).get("requires_approval"))) - self.assertEqual("requires_approval", (result.payload or {}).get("parsed_status")) + self.assertEqual( + "requires_approval", (result.payload or {}).get("parsed_status") + ) @patch("core.tasks.providers.codex_cli.subprocess.run") def test_retries_with_positional_op_when_flag_unsupported(self, run_mock): @@ -99,7 +103,9 @@ class CodexCLITaskProviderTests(SimpleTestCase): self.assertEqual(["codex", "task-sync", "create"], second[:3]) @patch("core.tasks.providers.codex_cli.subprocess.run") - def test_falls_back_to_builtin_approval_stub_when_no_task_sync_contract(self, run_mock): + def test_falls_back_to_builtin_approval_stub_when_no_task_sync_contract( + self, run_mock + ): run_mock.side_effect = [ CompletedProcess( args=[], @@ -124,8 +130,13 @@ class CodexCLITaskProviderTests(SimpleTestCase): ) self.assertTrue(result.ok) self.assertTrue(bool((result.payload or {}).get("requires_approval"))) - self.assertEqual("requires_approval", str((result.payload or {}).get("status") or "")) - self.assertEqual("builtin_task_sync_stub", str((result.payload or {}).get("fallback_mode") or "")) + self.assertEqual( + "requires_approval", str((result.payload or {}).get("status") or "") + ) + self.assertEqual( + "builtin_task_sync_stub", + str((result.payload or {}).get("fallback_mode") or ""), + ) @patch("core.tasks.providers.codex_cli.subprocess.run") def test_builtin_stub_approval_response_returns_ok(self, run_mock): diff --git a/core/tests/test_codex_commands_phase1.py b/core/tests/test_codex_commands_phase1.py index ea13fe9..c95e0df 100644 --- a/core/tests/test_codex_commands_phase1.py +++ b/core/tests/test_codex_commands_phase1.py @@ -8,10 +8,10 @@ from core.commands.engine import process_inbound_message from core.commands.handlers.codex import parse_codex_command from core.models import ( ChatSession, - CommandChannelBinding, - CommandProfile, CodexPermissionRequest, CodexRun, + CommandChannelBinding, + CommandProfile, DerivedTask, ExternalSyncEvent, Message, @@ -41,7 +41,9 @@ class CodexCommandParserTests(TestCase): class CodexCommandExecutionTests(TestCase): def setUp(self): - self.user = User.objects.create_user("codex-cmd-user", "codex-cmd@example.com", "x") + self.user = User.objects.create_user( + "codex-cmd-user", "codex-cmd@example.com", "x" + ) self.person = Person.objects.create(user=self.user, name="Codex Cmd") self.identifier = PersonIdentifier.objects.create( user=self.user, @@ -49,7 +51,9 @@ class CodexCommandExecutionTests(TestCase): service="web", identifier="web-chan-1", ) - self.session = ChatSession.objects.create(user=self.user, identifier=self.identifier) + self.session = ChatSession.objects.create( + user=self.user, identifier=self.identifier + ) self.project = TaskProject.objects.create(user=self.user, name="Project A") self.task = DerivedTask.objects.create( user=self.user, @@ -126,7 +130,10 @@ class CodexCommandExecutionTests(TestCase): self.assertEqual("waiting_approval", run.status) event = ExternalSyncEvent.objects.order_by("-created_at").first() self.assertEqual("waiting_approval", event.status) - self.assertEqual("default", str((event.payload or {}).get("provider_payload", {}).get("mode") or "")) + self.assertEqual( + "default", + str((event.payload or {}).get("provider_payload", {}).get("mode") or ""), + ) self.assertTrue( CodexPermissionRequest.objects.filter( user=self.user, @@ -167,7 +174,10 @@ class CodexCommandExecutionTests(TestCase): source_service="web", source_channel="web-chan-1", status="waiting_approval", - request_payload={"action": "append_update", "provider_payload": {"task_id": str(self.task.id)}}, + request_payload={ + "action": "append_update", + "provider_payload": {"task_id": str(self.task.id)}, + }, result_payload={}, ) req = CodexPermissionRequest.objects.create( @@ -207,7 +217,9 @@ class CodexCommandExecutionTests(TestCase): self.assertEqual("approved_waiting_resume", run.status) self.assertEqual("ok", waiting_event.status) self.assertTrue( - ExternalSyncEvent.objects.filter(idempotency_key="codex_approval:ak-123:approved", status="pending").exists() + ExternalSyncEvent.objects.filter( + idempotency_key="codex_approval:ak-123:approved", status="pending" + ).exists() ) def test_approve_pre_submit_request_queues_original_action(self): @@ -226,7 +238,10 @@ class CodexCommandExecutionTests(TestCase): source_service="web", source_channel="web-chan-1", status="waiting_approval", - request_payload={"action": "append_update", "provider_payload": {"task_id": str(self.task.id)}}, + request_payload={ + "action": "append_update", + "provider_payload": {"task_id": str(self.task.id)}, + }, result_payload={}, ) CodexPermissionRequest.objects.create( @@ -264,7 +279,11 @@ class CodexCommandExecutionTests(TestCase): ) self.assertEqual(1, len(results)) self.assertTrue(results[0].ok) - resume = ExternalSyncEvent.objects.filter(idempotency_key="codex_cmd:resume:1").first() + resume = ExternalSyncEvent.objects.filter( + idempotency_key="codex_cmd:resume:1" + ).first() self.assertIsNotNone(resume) self.assertEqual("pending", resume.status) - self.assertEqual("append_update", str((resume.payload or {}).get("action") or "")) + self.assertEqual( + "append_update", str((resume.payload or {}).get("action") or "") + ) diff --git a/core/tests/test_codex_worker_phase1.py b/core/tests/test_codex_worker_phase1.py index b4895ff..9ff1203 100644 --- a/core/tests/test_codex_worker_phase1.py +++ b/core/tests/test_codex_worker_phase1.py @@ -5,13 +5,22 @@ from unittest.mock import patch from django.test import TestCase from core.management.commands.codex_worker import Command as CodexWorkerCommand -from core.models import CodexPermissionRequest, CodexRun, ExternalSyncEvent, TaskProject, TaskProviderConfig, User +from core.models import ( + CodexPermissionRequest, + CodexRun, + ExternalSyncEvent, + TaskProject, + TaskProviderConfig, + User, +) from core.tasks.providers.base import ProviderResult class CodexWorkerPhase1Tests(TestCase): def setUp(self): - self.user = User.objects.create_user("codex-worker-user", "codex-worker@example.com", "x") + self.user = User.objects.create_user( + "codex-worker-user", "codex-worker@example.com", "x" + ) self.project = TaskProject.objects.create(user=self.user, name="Worker Project") self.cfg = TaskProviderConfig.objects.create( user=self.user, @@ -57,7 +66,9 @@ class CodexWorkerPhase1Tests(TestCase): run_in_worker = True def append_update(self, config, payload): - return ProviderResult(ok=True, payload={"status": "ok", "summary": "done"}) + return ProviderResult( + ok=True, payload={"status": "ok", "summary": "done"} + ) create_task = mark_complete = link_task = append_update @@ -71,7 +82,9 @@ class CodexWorkerPhase1Tests(TestCase): self.assertEqual("done", str(run.result_payload.get("summary") or "")) @patch("core.management.commands.codex_worker.get_provider") - def test_requires_approval_moves_to_waiting_and_creates_permission_request(self, get_provider_mock): + def test_requires_approval_moves_to_waiting_and_creates_permission_request( + self, get_provider_mock + ): run = CodexRun.objects.create( user=self.user, project=self.project, @@ -128,7 +141,10 @@ class CodexWorkerPhase1Tests(TestCase): user=self.user, provider="codex_cli", status="waiting_approval", - payload={"action": "append_update", "provider_payload": {"mode": "default"}}, + payload={ + "action": "append_update", + "provider_payload": {"mode": "default"}, + }, error="", ) run = CodexRun.objects.create( @@ -169,7 +185,9 @@ class CodexWorkerPhase1Tests(TestCase): run_in_worker = True def append_update(self, config, payload): - return ProviderResult(ok=True, payload={"status": "ok", "summary": "resumed"}) + return ProviderResult( + ok=True, payload={"status": "ok", "summary": "resumed"} + ) create_task = mark_complete = link_task = append_update diff --git a/core/tests/test_command_security_policy.py b/core/tests/test_command_security_policy.py index d1cfcc4..7961a83 100644 --- a/core/tests/test_command_security_policy.py +++ b/core/tests/test_command_security_policy.py @@ -89,7 +89,9 @@ class CommandSecurityPolicyTests(TestCase): ) self.assertEqual(1, len(results)) self.assertEqual("skipped", results[0].status) - self.assertTrue(str(results[0].error).startswith("policy_denied:service_not_allowed")) + self.assertTrue( + str(results[0].error).startswith("policy_denied:service_not_allowed") + ) def test_gateway_scope_can_require_trusted_omemo_key(self): CommandSecurityPolicy.objects.create( @@ -120,7 +122,9 @@ class CommandSecurityPolicyTests(TestCase): channel_identifier="policy-user@zm.is", sender_identifier="policy-user@zm.is/phone", message_text=".tasks list", - message_meta={"xmpp": {"omemo_status": "detected", "omemo_client_key": "sid:abc"}}, + message_meta={ + "xmpp": {"omemo_status": "detected", "omemo_client_key": "sid:abc"} + }, payload={}, ), routes=[ diff --git a/core/tests/test_command_variant_policy.py b/core/tests/test_command_variant_policy.py index 2597545..5765bb2 100644 --- a/core/tests/test_command_variant_policy.py +++ b/core/tests/test_command_variant_policy.py @@ -9,8 +9,8 @@ from core.commands.base import CommandContext from core.commands.handlers.bp import BPCommandHandler from core.commands.policies import ensure_variant_policies_for_profile from core.models import ( - BusinessPlanDocument, AI, + BusinessPlanDocument, ChatSession, CommandAction, CommandChannelBinding, @@ -37,7 +37,9 @@ class CommandVariantPolicyTests(TransactionTestCase): service="whatsapp", identifier="120363402761690215", ) - self.session = ChatSession.objects.create(user=self.user, identifier=self.identifier) + self.session = ChatSession.objects.create( + user=self.user, identifier=self.identifier + ) self.profile = CommandProfile.objects.create( user=self.user, slug="bp", @@ -109,7 +111,9 @@ class CommandVariantPolicyTests(TransactionTestCase): def test_bp_primary_can_run_in_verbatim_mode_without_ai(self): ensure_variant_policies_for_profile(self.profile) - policy = CommandVariantPolicy.objects.get(profile=self.profile, variant_key="bp") + policy = CommandVariantPolicy.objects.get( + profile=self.profile, variant_key="bp" + ) policy.generation_mode = "verbatim" policy.send_plan_to_egress = False policy.send_status_to_source = False @@ -143,7 +147,9 @@ class CommandVariantPolicyTests(TransactionTestCase): def test_bp_set_ai_mode_ignores_template(self): ensure_variant_policies_for_profile(self.profile) - policy = CommandVariantPolicy.objects.get(profile=self.profile, variant_key="bp_set") + policy = CommandVariantPolicy.objects.get( + profile=self.profile, variant_key="bp_set" + ) policy.generation_mode = "ai" policy.send_plan_to_egress = False policy.send_status_to_source = False @@ -222,4 +228,6 @@ class CommandVariantPolicyTests(TransactionTestCase): self.assertTrue(result.ok) source_status.assert_awaited() self.assertEqual(1, binding_send.await_count) - self.assertFalse(BusinessPlanDocument.objects.filter(trigger_message=trigger).exists()) + self.assertFalse( + BusinessPlanDocument.objects.filter(trigger_message=trigger).exists() + ) diff --git a/core/tests/test_compose_react.py b/core/tests/test_compose_react.py index 4b8fe7f..0ec72eb 100644 --- a/core/tests/test_compose_react.py +++ b/core/tests/test_compose_react.py @@ -13,7 +13,9 @@ class ComposeReactTests(TestCase): self.user = User.objects.create_user("compose-react", "react@example.com", "pw") self.client.force_login(self.user) - def _build_message(self, *, service: str, identifier: str, source_message_id: str = ""): + def _build_message( + self, *, service: str, identifier: str, source_message_id: str = "" + ): person = Person.objects.create(user=self.user, name=f"{service} person") person_identifier = PersonIdentifier.objects.create( user=self.user, diff --git a/core/tests/test_cross_platform_messaging.py b/core/tests/test_cross_platform_messaging.py index 87beab6..86e481b 100644 --- a/core/tests/test_cross_platform_messaging.py +++ b/core/tests/test_cross_platform_messaging.py @@ -6,6 +6,7 @@ Signal coverage is in test_signal_reply_send.py. This file fills the gaps for WhatsApp and XMPP, and verifies the shared reply_sync infrastructure works correctly for both services. """ + from __future__ import annotations import xml.etree.ElementTree as ET @@ -25,11 +26,11 @@ from core.messaging import history, reply_sync from core.models import ChatSession, Message, Person, PersonIdentifier, User from core.presence.inference import now_ms - # --------------------------------------------------------------------------- # Helpers # --------------------------------------------------------------------------- + def _fake_stanza(xml_text: str) -> SimpleNamespace: """Minimal stanza-like object with an .xml attribute.""" return SimpleNamespace(xml=ET.fromstring(xml_text)) @@ -39,6 +40,7 @@ def _fake_stanza(xml_text: str) -> SimpleNamespace: # WhatsApp — reply extraction (pure, no DB) # --------------------------------------------------------------------------- + class WhatsAppReplyExtractionTests(SimpleTestCase): def test_extract_reply_ref_from_contextinfo_stanza_id(self): payload = { @@ -87,6 +89,7 @@ class WhatsAppReplyExtractionTests(SimpleTestCase): # WhatsApp — reply resolution (requires DB) # --------------------------------------------------------------------------- + class WhatsAppReplyResolutionTests(TestCase): def setUp(self): self.user = User.objects.create_user( @@ -178,7 +181,9 @@ class WhatsAppReplyResolutionTests(TestCase): ) self.anchor.refresh_from_db() reactions = list((self.anchor.receipt_payload or {}).get("reactions") or []) - removed = [r for r in reactions if r.get("emoji") == "👍" and not r.get("removed")] + removed = [ + r for r in reactions if r.get("emoji") == "👍" and not r.get("removed") + ] self.assertEqual(0, len(removed)) @@ -186,6 +191,7 @@ class WhatsAppReplyResolutionTests(TestCase): # WhatsApp — outbound reply metadata # --------------------------------------------------------------------------- + class WhatsAppOutboundReplyTests(TestCase): def test_transport_passes_reply_metadata_to_whatsapp_api(self): mock_client = MagicMock() @@ -222,6 +228,7 @@ class WhatsAppOutboundReplyTests(TestCase): # XMPP — reaction extraction (pure, no DB) # --------------------------------------------------------------------------- + class XMPPReactionExtractionTests(SimpleTestCase): def test_extract_xep_0444_reaction(self): stanza = _fake_stanza( @@ -276,6 +283,7 @@ class XMPPReactionExtractionTests(SimpleTestCase): # XMPP — reply extraction (pure, no DB) # --------------------------------------------------------------------------- + class XMPPReplyExtractionTests(SimpleTestCase): def test_extract_reply_target_id_from_xep_0461_stanza(self): stanza = _fake_stanza( @@ -304,7 +312,9 @@ class XMPPReplyExtractionTests(SimpleTestCase): self.assertEqual("user@zm.is/mobile", ref.get("reply_source_chat_id")) def test_extract_reply_ref_returns_empty_for_missing_id(self): - ref = reply_sync.extract_reply_ref("xmpp", {"reply_source_chat_id": "user@zm.is"}) + ref = reply_sync.extract_reply_ref( + "xmpp", {"reply_source_chat_id": "user@zm.is"} + ) self.assertEqual({}, ref) @@ -312,6 +322,7 @@ class XMPPReplyExtractionTests(SimpleTestCase): # XMPP — reply resolution (requires DB) # --------------------------------------------------------------------------- + class XMPPReplyResolutionTests(TestCase): def setUp(self): self.user = User.objects.create_user( diff --git a/core/tests/test_event_projection_shadow.py b/core/tests/test_event_projection_shadow.py index d0a5438..4cea072 100644 --- a/core/tests/test_event_projection_shadow.py +++ b/core/tests/test_event_projection_shadow.py @@ -1,5 +1,5 @@ -from io import StringIO import time +from io import StringIO from django.core.management import call_command from django.test import TestCase, override_settings @@ -24,7 +24,9 @@ class EventProjectionShadowTests(TestCase): service="signal", identifier="+15555550333", ) - self.session = ChatSession.objects.create(user=self.user, identifier=self.identifier) + self.session = ChatSession.objects.create( + user=self.user, identifier=self.identifier + ) def test_shadow_compare_has_zero_mismatch_when_projection_matches(self): message = Message.objects.create( diff --git a/core/tests/test_mcp_tools.py b/core/tests/test_mcp_tools.py index 5dad19f..b6c596b 100644 --- a/core/tests/test_mcp_tools.py +++ b/core/tests/test_mcp_tools.py @@ -7,13 +7,13 @@ from django.test import TestCase, override_settings from core.mcp.tools import execute_tool, tool_specs from core.models import ( AIRequest, + DerivedTask, + DerivedTaskEvent, MCPToolAuditLog, MemoryItem, TaskProject, User, WorkspaceConversation, - DerivedTask, - DerivedTaskEvent, ) @@ -80,9 +80,13 @@ class MCPToolTests(TestCase): first_hit = (memory_payload.get("hits") or [{}])[0] self.assertEqual(str(self.memory.id), str(first_hit.get("memory_id"))) - list_payload = execute_tool("tasks.list", {"user_id": self.user.id, "limit": 10}) + list_payload = execute_tool( + "tasks.list", {"user_id": self.user.id, "limit": 10} + ) self.assertEqual(1, int(list_payload.get("count") or 0)) - self.assertEqual(str(self.task.id), str((list_payload.get("items") or [{}])[0].get("id"))) + self.assertEqual( + str(self.task.id), str((list_payload.get("items") or [{}])[0].get("id")) + ) search_payload = execute_tool( "tasks.search", @@ -90,9 +94,13 @@ class MCPToolTests(TestCase): ) self.assertEqual(1, int(search_payload.get("count") or 0)) - events_payload = execute_tool("tasks.events", {"task_id": str(self.task.id), "limit": 5}) + events_payload = execute_tool( + "tasks.events", {"task_id": str(self.task.id), "limit": 5} + ) self.assertEqual(1, int(events_payload.get("count") or 0)) - self.assertEqual("created", str((events_payload.get("items") or [{}])[0].get("event_type"))) + self.assertEqual( + "created", str((events_payload.get("items") or [{}])[0].get("event_type")) + ) def test_memory_proposal_review_flow(self): propose_payload = execute_tool( @@ -182,7 +190,9 @@ class MCPToolTests(TestCase): "note": "Implemented wiki tooling.", }, ) - self.assertEqual("progress", str((note_payload.get("event") or {}).get("event_type"))) + self.assertEqual( + "progress", str((note_payload.get("event") or {}).get("event_type")) + ) artifact_payload = execute_tool( "tasks.link_artifact", diff --git a/core/tests/test_memory_pipeline_commands.py b/core/tests/test_memory_pipeline_commands.py index e628789..da80376 100644 --- a/core/tests/test_memory_pipeline_commands.py +++ b/core/tests/test_memory_pipeline_commands.py @@ -7,7 +7,13 @@ from django.core.management import call_command from django.test import TestCase from django.utils import timezone -from core.models import MemoryChangeRequest, MemoryItem, MessageEvent, User, WorkspaceConversation +from core.models import ( + MemoryChangeRequest, + MemoryItem, + MessageEvent, + User, + WorkspaceConversation, +) class MemoryPipelineCommandTests(TestCase): @@ -46,7 +52,9 @@ class MemoryPipelineCommandTests(TestCase): self.assertIn("memory-suggest-from-messages", rendered) self.assertGreaterEqual(MemoryItem.objects.filter(user=self.user).count(), 1) self.assertGreaterEqual( - MemoryChangeRequest.objects.filter(user=self.user, status="pending").count(), + MemoryChangeRequest.objects.filter( + user=self.user, status="pending" + ).count(), 1, ) diff --git a/core/tests/test_phase1_command_reply.py b/core/tests/test_phase1_command_reply.py index dfc23c8..6bfb70b 100644 --- a/core/tests/test_phase1_command_reply.py +++ b/core/tests/test_phase1_command_reply.py @@ -6,10 +6,9 @@ from django.test import TestCase from core.commands.base import CommandContext from core.commands.engine import _matches_trigger, process_inbound_message from core.messaging.reply_sync import extract_reply_ref, resolve_reply_target -from core.views.compose import _command_options_for_channel from core.models import ( - ChatTaskSource, ChatSession, + ChatTaskSource, CommandAction, CommandChannelBinding, CommandProfile, @@ -19,6 +18,7 @@ from core.models import ( PersonIdentifier, User, ) +from core.views.compose import _command_options_for_channel class Phase1ReplyResolutionTests(TestCase): @@ -402,7 +402,9 @@ class Phase1CommandEngineTests(TestCase): if profile is None: return self.assertEqual(3, CommandAction.objects.filter(profile=profile).count()) - self.assertEqual(3, CommandVariantPolicy.objects.filter(profile=profile).count()) + self.assertEqual( + 3, CommandVariantPolicy.objects.filter(profile=profile).count() + ) self.assertEqual( 2, CommandChannelBinding.objects.filter( @@ -436,7 +438,9 @@ class Phase1CommandEngineTests(TestCase): self.assertEqual(1, len(second_results)) self.assertEqual("reply_required", second_results[0].error) self.assertEqual(3, CommandAction.objects.filter(profile=profile).count()) - self.assertEqual(3, CommandVariantPolicy.objects.filter(profile=profile).count()) + self.assertEqual( + 3, CommandVariantPolicy.objects.filter(profile=profile).count() + ) self.assertEqual( 2, CommandChannelBinding.objects.filter( diff --git a/core/tests/test_presence_engine.py b/core/tests/test_presence_engine.py index 2303a62..e29df49 100644 --- a/core/tests/test_presence_engine.py +++ b/core/tests/test_presence_engine.py @@ -21,7 +21,9 @@ from core.presence.inference import now_ms class PresenceEngineTests(TestCase): def setUp(self): - self.user = User.objects.create_user("presence-user", "presence@example.com", "x") + self.user = User.objects.create_user( + "presence-user", "presence@example.com", "x" + ) self.person = Person.objects.create(user=self.user, name="Presence Person") self.identifier = PersonIdentifier.objects.create( user=self.user, @@ -57,7 +59,9 @@ class PresenceEngineTests(TestCase): ) ) self.assertIsNotNone(event) - self.assertEqual(1, ContactAvailabilityEvent.objects.filter(user=self.user).count()) + self.assertEqual( + 1, ContactAvailabilityEvent.objects.filter(user=self.user).count() + ) self.assertEqual("available", event.availability_state) def test_inactivity_transitions_to_fading(self): @@ -106,7 +110,9 @@ class PresenceEngineTests(TestCase): at_ts=base_ts + 60_000, ) self.assertIsNone(fade_event) - self.assertEqual(1, ContactAvailabilityEvent.objects.filter(user=self.user).count()) + self.assertEqual( + 1, ContactAvailabilityEvent.objects.filter(user=self.user).count() + ) def test_adjacent_same_state_events_extend_single_span(self): ts0 = now_ms() @@ -134,7 +140,9 @@ class PresenceEngineTests(TestCase): ts=ts0 + 5_000, ) ) - spans = list(ContactAvailabilitySpan.objects.filter(user=self.user).order_by("start_ts")) + spans = list( + ContactAvailabilitySpan.objects.filter(user=self.user).order_by("start_ts") + ) self.assertEqual(1, len(spans)) self.assertEqual(ts0, spans[0].start_ts) self.assertEqual(ts0 + 5_000, spans[0].end_ts) diff --git a/core/tests/test_reaction_normalization.py b/core/tests/test_reaction_normalization.py index 08a0b60..e7bcf9d 100644 --- a/core/tests/test_reaction_normalization.py +++ b/core/tests/test_reaction_normalization.py @@ -62,12 +62,21 @@ class ReactionNormalizationTests(TestCase): self.assertEqual(str(exact_message.id), str(updated.id)) exact_message.refresh_from_db() near_message.refresh_from_db() - self.assertEqual(1, len((exact_message.receipt_payload or {}).get("reactions") or [])) + self.assertEqual( + 1, len((exact_message.receipt_payload or {}).get("reactions") or []) + ) self.assertEqual( "exact_source_message_id_ts", - str((exact_message.receipt_payload or {}).get("reaction_last_match_strategy") or ""), + str( + (exact_message.receipt_payload or {}).get( + "reaction_last_match_strategy" + ) + or "" + ), + ) + self.assertEqual( + 0, len((near_message.receipt_payload or {}).get("reactions") or []) ) - self.assertEqual(0, len((near_message.receipt_payload or {}).get("reactions") or [])) def test_remove_without_emoji_is_audited_not_active(self): message = Message.objects.create( diff --git a/core/tests/test_reconcile_workspace_metric_history.py b/core/tests/test_reconcile_workspace_metric_history.py index 96a07d6..dfbe87b 100644 --- a/core/tests/test_reconcile_workspace_metric_history.py +++ b/core/tests/test_reconcile_workspace_metric_history.py @@ -28,7 +28,9 @@ class ReconcileWorkspaceMetricHistoryCommandTests(TestCase): service="whatsapp", identifier="15551230000@s.whatsapp.net", ) - self.session = ChatSession.objects.create(user=self.user, identifier=self.identifier) + self.session = ChatSession.objects.create( + user=self.user, identifier=self.identifier + ) base_ts = 1_700_000_000_000 for idx in range(10): inbound = idx % 2 == 0 diff --git a/core/tests/test_signal_relink.py b/core/tests/test_signal_relink.py index 0a8d678..d69cb8d 100644 --- a/core/tests/test_signal_relink.py +++ b/core/tests/test_signal_relink.py @@ -1,7 +1,7 @@ from unittest.mock import patch -from django.urls import reverse from django.test import TestCase +from django.urls import reverse from core.models import User diff --git a/core/tests/test_signal_reply_send.py b/core/tests/test_signal_reply_send.py index 86a540d..10e0dca 100644 --- a/core/tests/test_signal_reply_send.py +++ b/core/tests/test_signal_reply_send.py @@ -1,8 +1,7 @@ from __future__ import annotations import json -from unittest.mock import AsyncMock, patch -from unittest.mock import Mock +from unittest.mock import AsyncMock, Mock, patch from asgiref.sync import async_to_sync from django.conf import settings @@ -175,11 +174,15 @@ class SignalInboundReplyLinkTests(TransactionTestCase): } async_to_sync(client._process_raw_inbound_event)(json.dumps(payload)) - created = Message.objects.filter( - user=self.user, - session=self.session, - text="reply inbound s3", - ).order_by("-ts").first() + created = ( + Message.objects.filter( + user=self.user, + session=self.session, + text="reply inbound s3", + ) + .order_by("-ts") + .first() + ) self.assertIsNotNone(created) self.assertEqual(self.anchor.id, created.reply_to_id) self.assertEqual("1772545458187", created.reply_source_message_id) @@ -222,7 +225,9 @@ class SignalInboundReplyLinkTests(TransactionTestCase): "Expected Signal heart reaction to be applied to anchor receipt payload.", ) - def test_process_raw_inbound_event_applies_sync_reaction_using_destination_fallback(self): + def test_process_raw_inbound_event_applies_sync_reaction_using_destination_fallback( + self, + ): fake_ur = Mock() fake_ur.message_received = AsyncMock(return_value=None) fake_ur.xmpp = Mock() @@ -253,7 +258,7 @@ class SignalInboundReplyLinkTests(TransactionTestCase): "emoji": "🔥", "targetSentTimestamp": 1772545458187, } - } + }, } }, } @@ -352,7 +357,9 @@ class SignalRuntimeCommandWritebackTests(TestCase): service="signal", identifier="+15550003000", ) - self.session = ChatSession.objects.create(user=self.user, identifier=self.identifier) + self.session = ChatSession.objects.create( + user=self.user, identifier=self.identifier + ) self.message = Message.objects.create( user=self.user, session=self.session, diff --git a/core/tests/test_task_engine_plan09.py b/core/tests/test_task_engine_plan09.py index 5806149..0127b73 100644 --- a/core/tests/test_task_engine_plan09.py +++ b/core/tests/test_task_engine_plan09.py @@ -5,7 +5,6 @@ from unittest.mock import AsyncMock, patch from asgiref.sync import async_to_sync from django.test import TestCase, override_settings -from django.utils import timezone from core.models import ( ChatSession, @@ -88,7 +87,9 @@ class TaskEnginePlan09Tests(TestCase): service="signal", identifier="+15559001234", ) - self.session = ChatSession.objects.create(user=self.user, identifier=self.identifier) + self.session = ChatSession.objects.create( + user=self.user, identifier=self.identifier + ) self.project = TaskProject.objects.create(user=self.user, name="Plan09 Project") ChatTaskSource.objects.create( user=self.user, @@ -133,7 +134,9 @@ class TaskEnginePlan09Tests(TestCase): async_to_sync(process_inbound_task_intelligence)(seed) cmd = self._msg(".task list", ts=1002) async_to_sync(process_inbound_task_intelligence)(cmd) - payloads = [str(call.kwargs.get("text") or "") for call in mocked_send.await_args_list] + payloads = [ + str(call.kwargs.get("text") or "") for call in mocked_send.await_args_list + ] self.assertTrue(any("open tasks" in row.lower() for row in payloads)) @patch("core.tasks.engine.send_message_raw", new_callable=AsyncMock) @@ -143,7 +146,9 @@ class TaskEnginePlan09Tests(TestCase): task = DerivedTask.objects.get(origin_message=seed) cmd = self._msg(f".task show #{task.reference_code}", ts=1004) async_to_sync(process_inbound_task_intelligence)(cmd) - payloads = [str(call.kwargs.get("text") or "") for call in mocked_send.await_args_list] + payloads = [ + str(call.kwargs.get("text") or "") for call in mocked_send.await_args_list + ] self.assertTrue(any("deploy new version" in row.lower() for row in payloads)) self.assertTrue(any(str(task.reference_code) in row for row in payloads)) @@ -157,9 +162,13 @@ class TaskEnginePlan09Tests(TestCase): task.refresh_from_db() self.assertEqual("completed", task.status_snapshot) self.assertTrue( - DerivedTaskEvent.objects.filter(task=task, event_type="completion_marked").exists() + DerivedTaskEvent.objects.filter( + task=task, event_type="completion_marked" + ).exists() ) - payloads = [str(call.kwargs.get("text") or "") for call in mocked_send.await_args_list] + payloads = [ + str(call.kwargs.get("text") or "") for call in mocked_send.await_args_list + ] self.assertTrue(any("completed" in row.lower() for row in payloads)) def test_dot_task_complete_creates_audit_event(self): @@ -169,7 +178,9 @@ class TaskEnginePlan09Tests(TestCase): with patch("core.tasks.engine.send_message_raw", new_callable=AsyncMock): cmd = self._msg(f".task complete #{task.reference_code}", ts=1008) async_to_sync(process_inbound_task_intelligence)(cmd) - event = DerivedTaskEvent.objects.filter(task=task, event_type="completion_marked").first() + event = DerivedTaskEvent.objects.filter( + task=task, event_type="completion_marked" + ).first() self.assertIsNotNone(event) self.assertIn("command", str(event.payload or {}).lower()) @@ -185,7 +196,9 @@ class TaskEngineMemoryContextTests(TestCase): service="whatsapp", identifier="447700900001@s.whatsapp.net", ) - self.session = ChatSession.objects.create(user=self.user, identifier=self.identifier) + self.session = ChatSession.objects.create( + user=self.user, identifier=self.identifier + ) self.project = TaskProject.objects.create(user=self.user, name="Mem Project") ChatTaskSource.objects.create( user=self.user, @@ -218,8 +231,16 @@ class TaskEngineMemoryContextTests(TestCase): from core.models import CodexRun m = self._msg("task: fix authentication bug", ts=2001) - fake_memory = [{"id": "mem-1", "memory_kind": "fact", "content": {"text": "prefers short summaries"}}] - with patch("core.tasks.engine.retrieve_memories_for_prompt", return_value=fake_memory): + fake_memory = [ + { + "id": "mem-1", + "memory_kind": "fact", + "content": {"text": "prefers short summaries"}, + } + ] + with patch( + "core.tasks.engine.retrieve_memories_for_prompt", return_value=fake_memory + ): async_to_sync(process_inbound_task_intelligence)(m) task = DerivedTask.objects.filter(origin_message=m).first() self.assertIsNotNone(task) @@ -227,5 +248,7 @@ class TaskEngineMemoryContextTests(TestCase): self.assertIsNotNone(run, "Expected CodexRun created for task") provider_payload = (run.request_payload or {}).get("provider_payload") or {} memory_context = provider_payload.get("memory_context") - self.assertIsNotNone(memory_context, "Expected memory_context in CodexRun provider payload") + self.assertIsNotNone( + memory_context, "Expected memory_context in CodexRun provider payload" + ) self.assertEqual(1, len(memory_context)) diff --git a/core/tests/test_tasks_pages_management.py b/core/tests/test_tasks_pages_management.py index 7c06738..fcb7fb4 100644 --- a/core/tests/test_tasks_pages_management.py +++ b/core/tests/test_tasks_pages_management.py @@ -48,7 +48,9 @@ class TasksPagesManagementTests(TestCase): self.assertEqual(200, response.status_code) project = TaskProject.objects.get(user=self.user, name="Ops") self.assertIsNotNone(project) - self.assertFalse(ChatTaskSource.objects.filter(user=self.user, project=project).exists()) + self.assertFalse( + ChatTaskSource.objects.filter(user=self.user, project=project).exists() + ) def test_tasks_hub_can_map_identifier_to_selected_project(self): project = TaskProject.objects.create(user=self.user, name="Mapped") @@ -108,7 +110,9 @@ class TasksPagesManagementTests(TestCase): follow=True, ) self.assertEqual(200, delete_response.status_code) - self.assertFalse(TaskEpic.objects.filter(project=project, name="Phase 1").exists()) + self.assertFalse( + TaskEpic.objects.filter(project=project, name="Phase 1").exists() + ) def test_project_page_can_assign_and_clear_task_epic(self): project = TaskProject.objects.create(user=self.user, name="Roadmap") @@ -179,9 +183,13 @@ class TasksPagesManagementTests(TestCase): follow=True, ) self.assertEqual(200, response.status_code) - self.assertTrue(TaskEpic.objects.filter(project=project, name="Phase 2").exists()) + self.assertTrue( + TaskEpic.objects.filter(project=project, name="Phase 2").exists() + ) self.assertTrue(mocked_send.await_count >= 1) - payloads = [str(call.kwargs.get("text") or "") for call in mocked_send.await_args_list] + payloads = [ + str(call.kwargs.get("text") or "") for call in mocked_send.await_args_list + ] self.assertTrue(any("whatsapp usage" in row.lower() for row in payloads)) self.assertTrue(any("add task to epic" in row.lower() for row in payloads)) @@ -266,7 +274,9 @@ class TasksPagesManagementTests(TestCase): reference_code="2", status_snapshot="open", ) - response = self.client.get(reverse("tasks_project", kwargs={"project_id": str(project.id)})) + response = self.client.get( + reverse("tasks_project", kwargs={"project_id": str(project.id)}) + ) self.assertEqual(200, response.status_code) self.assertContains( response, @@ -302,7 +312,9 @@ class TasksPagesManagementTests(TestCase): payload={"source": "signal", "emoji": "❤️", "reason": "heart_reaction"}, ) - response = self.client.get(reverse("tasks_task", kwargs={"task_id": str(task.id)})) + response = self.client.get( + reverse("tasks_task", kwargs={"task_id": str(task.id)}) + ) self.assertEqual(200, response.status_code) self.assertContains(response, "View payload JSON") self.assertContains(response, "source: signal", html=True) diff --git a/core/tests/test_tasks_settings_and_toggle.py b/core/tests/test_tasks_settings_and_toggle.py index 71a1d9a..e9774df 100644 --- a/core/tests/test_tasks_settings_and_toggle.py +++ b/core/tests/test_tasks_settings_and_toggle.py @@ -3,8 +3,8 @@ from __future__ import annotations from unittest.mock import AsyncMock, patch from asgiref.sync import async_to_sync -from django.urls import reverse from django.test import TestCase, override_settings +from django.urls import reverse from core.models import ( ChatSession, @@ -12,24 +12,32 @@ from core.models import ( CodexPermissionRequest, CodexRun, DerivedTask, - ExternalSyncEvent, ExternalChatLink, + ExternalSyncEvent, Message, Person, PersonIdentifier, TaskCompletionPattern, - TaskProviderConfig, TaskProject, + TaskProviderConfig, User, ) from core.tasks.engine import process_inbound_task_intelligence -from core.views.compose import _command_options_for_channel, _toggle_task_announce_for_channel -from core.views.tasks import _apply_safe_defaults_for_user, _ensure_default_completion_patterns +from core.views.compose import ( + _command_options_for_channel, + _toggle_task_announce_for_channel, +) +from core.views.tasks import ( + _apply_safe_defaults_for_user, + _ensure_default_completion_patterns, +) class TaskSettingsBackfillTests(TestCase): def setUp(self): - self.user = User.objects.create_user("defaults-user", "defaults@example.com", "x") + self.user = User.objects.create_user( + "defaults-user", "defaults@example.com", "x" + ) self.person = Person.objects.create(user=self.user, name="Defaults Person") self.identifier = PersonIdentifier.objects.create( user=self.user, @@ -67,7 +75,9 @@ class TaskSettingsBackfillTests(TestCase): self.source.refresh_from_db() self.assertEqual("strict", self.project.settings.get("match_mode")) self.assertTrue(bool(self.project.settings.get("require_prefix"))) - self.assertEqual(["task:", "todo:"], self.project.settings.get("allowed_prefixes")) + self.assertEqual( + ["task:", "todo:"], self.project.settings.get("allowed_prefixes") + ) self.assertFalse(bool(self.project.settings.get("announce_task_id"))) self.assertEqual("strict", self.source.settings.get("match_mode")) self.assertTrue(bool(self.source.settings.get("require_prefix"))) @@ -75,7 +85,9 @@ class TaskSettingsBackfillTests(TestCase): def test_default_completion_phrases_seeded(self): _ensure_default_completion_patterns(self.user) phrases = set( - TaskCompletionPattern.objects.filter(user=self.user).values_list("phrase", flat=True) + TaskCompletionPattern.objects.filter(user=self.user).values_list( + "phrase", flat=True + ) ) self.assertTrue({"done", "completed", "fixed"}.issubset(phrases)) @@ -136,8 +148,12 @@ class TaskAnnounceRuntimeTests(TestCase): service="whatsapp", identifier="120363402761690215@g.us", ) - self.session = ChatSession.objects.create(user=self.user, identifier=self.identifier) - self.project = TaskProject.objects.create(user=self.user, name="Runtime Project") + self.session = ChatSession.objects.create( + user=self.user, identifier=self.identifier + ) + self.project = TaskProject.objects.create( + user=self.user, name="Runtime Project" + ) def _seed_source(self, announce_enabled: bool): return ChatTaskSource.objects.create( @@ -167,22 +183,32 @@ class TaskAnnounceRuntimeTests(TestCase): def test_no_announce_send_when_disabled(self): self._seed_source(False) - with patch("core.tasks.engine.send_message_raw", new=AsyncMock()) as mocked_send: - async_to_sync(process_inbound_task_intelligence)(self._msg("task: rotate secrets")) + with patch( + "core.tasks.engine.send_message_raw", new=AsyncMock() + ) as mocked_send: + async_to_sync(process_inbound_task_intelligence)( + self._msg("task: rotate secrets") + ) self.assertTrue(DerivedTask.objects.exists()) mocked_send.assert_not_awaited() def test_announce_send_when_enabled(self): self._seed_source(True) - with patch("core.tasks.engine.send_message_raw", new=AsyncMock(return_value=True)) as mocked_send: - async_to_sync(process_inbound_task_intelligence)(self._msg("task: rotate secrets")) + with patch( + "core.tasks.engine.send_message_raw", new=AsyncMock(return_value=True) + ) as mocked_send: + async_to_sync(process_inbound_task_intelligence)( + self._msg("task: rotate secrets") + ) self.assertTrue(DerivedTask.objects.exists()) mocked_send.assert_awaited() class TaskSettingsViewActionsTests(TestCase): def setUp(self): - self.user = User.objects.create_user("task-settings-user", "ts@example.com", "x") + self.user = User.objects.create_user( + "task-settings-user", "ts@example.com", "x" + ) self.client.force_login(self.user) self.project = TaskProject.objects.create(user=self.user, name="Project A") self.source = ChatTaskSource.objects.create( @@ -214,7 +240,9 @@ class TaskSettingsViewActionsTests(TestCase): @override_settings(TASK_DERIVATION_USE_AI=False) class TaskAutoBootstrapTests(TestCase): def setUp(self): - self.user = User.objects.create_user("task-auto-user", "task-auto@example.com", "x") + self.user = User.objects.create_user( + "task-auto-user", "task-auto@example.com", "x" + ) self.person = Person.objects.create(user=self.user, name="Bootstrap Chat") self.identifier = PersonIdentifier.objects.create( user=self.user, @@ -222,7 +250,9 @@ class TaskAutoBootstrapTests(TestCase): service="whatsapp", identifier="120363402761690215@g.us", ) - self.session = ChatSession.objects.create(user=self.user, identifier=self.identifier) + self.session = ChatSession.objects.create( + user=self.user, identifier=self.identifier + ) def test_task_message_auto_creates_project_and_source(self): msg = Message.objects.create( @@ -243,13 +273,17 @@ class TaskAutoBootstrapTests(TestCase): enabled=True, ).first() self.assertIsNotNone(source) - self.assertTrue(TaskProject.objects.filter(user=self.user, id=source.project_id).exists()) + self.assertTrue( + TaskProject.objects.filter(user=self.user, id=source.project_id).exists() + ) self.assertEqual(1, DerivedTask.objects.filter(user=self.user).count()) class TaskProjectDeleteGuardTests(TestCase): def setUp(self): - self.user = User.objects.create_user("task-delete-user", "task-delete@example.com", "x") + self.user = User.objects.create_user( + "task-delete-user", "task-delete@example.com", "x" + ) self.client.force_login(self.user) self.project = TaskProject.objects.create(user=self.user, name="Delete Me") self.source = ChatTaskSource.objects.create( @@ -271,7 +305,9 @@ class TaskProjectDeleteGuardTests(TestCase): follow=True, ) self.assertEqual(200, response.status_code) - self.assertTrue(TaskProject.objects.filter(id=self.project.id, user=self.user).exists()) + self.assertTrue( + TaskProject.objects.filter(id=self.project.id, user=self.user).exists() + ) def test_project_delete_reseeds_default_mapping(self): response = self.client.post( @@ -284,7 +320,9 @@ class TaskProjectDeleteGuardTests(TestCase): follow=True, ) self.assertEqual(200, response.status_code) - self.assertFalse(TaskProject.objects.filter(id=self.project.id, user=self.user).exists()) + self.assertFalse( + TaskProject.objects.filter(id=self.project.id, user=self.user).exists() + ) self.assertTrue( ChatTaskSource.objects.filter( user=self.user, @@ -297,7 +335,9 @@ class TaskProjectDeleteGuardTests(TestCase): class TaskHubEmptyProjectVisibilityTests(TestCase): def setUp(self): - self.user = User.objects.create_user("task-hub-user", "task-hub@example.com", "x") + self.user = User.objects.create_user( + "task-hub-user", "task-hub@example.com", "x" + ) self.client.force_login(self.user) self.empty = TaskProject.objects.create(user=self.user, name="Empty") self.used = TaskProject.objects.create(user=self.user, name="Used") @@ -326,7 +366,9 @@ class TaskHubEmptyProjectVisibilityTests(TestCase): class TaskSettingsExternalChatLinkScopeTests(TestCase): def setUp(self): - self.user = User.objects.create_user("task-link-user", "task-link@example.com", "x") + self.user = User.objects.create_user( + "task-link-user", "task-link@example.com", "x" + ) self.client.force_login(self.user) self.group_person = Person.objects.create(user=self.user, name="Scoped Group") self.group_identifier = PersonIdentifier.objects.create( @@ -390,7 +432,9 @@ class TaskSettingsExternalChatLinkScopeTests(TestCase): class CodexSettingsAndSubmitTests(TestCase): def setUp(self): - self.user = User.objects.create_user("codex-settings-user", "codex-settings@example.com", "x") + self.user = User.objects.create_user( + "codex-settings-user", "codex-settings@example.com", "x" + ) self.client.force_login(self.user) self.project = TaskProject.objects.create(user=self.user, name="Codex Project") self.task = DerivedTask.objects.create( @@ -426,7 +470,9 @@ class CodexSettingsAndSubmitTests(TestCase): self.assertTrue(cfg.enabled) self.assertEqual("team-a", str(cfg.settings.get("instance_label") or "")) self.assertEqual("web", str(cfg.settings.get("approver_service") or "")) - self.assertEqual("approver-chan", str(cfg.settings.get("approver_identifier") or "")) + self.assertEqual( + "approver-chan", str(cfg.settings.get("approver_identifier") or "") + ) def test_task_submit_endpoint_creates_codex_run_and_event(self): TaskProviderConfig.objects.create( @@ -444,10 +490,20 @@ class CodexSettingsAndSubmitTests(TestCase): follow=True, ) self.assertEqual(200, response.status_code) - run = CodexRun.objects.filter(user=self.user, task=self.task).order_by("-created_at").first() + run = ( + CodexRun.objects.filter(user=self.user, task=self.task) + .order_by("-created_at") + .first() + ) self.assertIsNotNone(run) self.assertEqual("waiting_approval", str(getattr(run, "status", ""))) - event = ExternalSyncEvent.objects.filter(user=self.user, task=self.task, provider="codex_cli").order_by("-created_at").first() + event = ( + ExternalSyncEvent.objects.filter( + user=self.user, task=self.task, provider="codex_cli" + ) + .order_by("-created_at") + .first() + ) self.assertIsNotNone(event) self.assertEqual("waiting_approval", str(getattr(event, "status", ""))) self.assertTrue( @@ -474,7 +530,10 @@ class CodexSettingsAndSubmitTests(TestCase): source_service="web", source_channel="web-chan-1", status="waiting_approval", - request_payload={"action": "append_update", "provider_payload": {"task_id": str(self.task.id)}}, + request_payload={ + "action": "append_update", + "provider_payload": {"task_id": str(self.task.id)}, + }, result_payload={}, ) req = CodexPermissionRequest.objects.create( diff --git a/core/tests/test_transport_capabilities.py b/core/tests/test_transport_capabilities.py index 4211e75..d0a9e54 100644 --- a/core/tests/test_transport_capabilities.py +++ b/core/tests/test_transport_capabilities.py @@ -2,7 +2,11 @@ from asgiref.sync import async_to_sync from django.test import SimpleTestCase from core.clients import transport -from core.transports.capabilities import capability_snapshot, supports, unsupported_reason +from core.transports.capabilities import ( + capability_snapshot, + supports, + unsupported_reason, +) class TransportCapabilitiesTests(SimpleTestCase): @@ -11,7 +15,10 @@ class TransportCapabilitiesTests(SimpleTestCase): def test_instagram_reactions_not_supported(self): self.assertFalse(supports("instagram", "reactions")) - self.assertIn("instagram does not support reactions", unsupported_reason("instagram", "reactions")) + self.assertIn( + "instagram does not support reactions", + unsupported_reason("instagram", "reactions"), + ) def test_snapshot_has_schema_version(self): snapshot = capability_snapshot() diff --git a/core/tests/test_whatsapp_reaction_and_recalc.py b/core/tests/test_whatsapp_reaction_and_recalc.py index 894ba2d..8767297 100644 --- a/core/tests/test_whatsapp_reaction_and_recalc.py +++ b/core/tests/test_whatsapp_reaction_and_recalc.py @@ -49,7 +49,9 @@ class WhatsAppReactionHandlingTests(TestCase): service="whatsapp", identifier="15551234567@s.whatsapp.net", ) - self.session = ChatSession.objects.create(user=self.user, identifier=self.identifier) + self.session = ChatSession.objects.create( + user=self.user, identifier=self.identifier + ) self.base_ts = now_ms() self.target = Message.objects.create( user=self.user, @@ -84,7 +86,9 @@ class WhatsAppReactionHandlingTests(TestCase): parsed = self.client._extract_reaction_event(message_obj) self.assertIsNotNone(parsed) self.assertEqual("wa-target-1", str(parsed.get("target_message_id") or "")) - before_count = Message.objects.filter(user=self.user, session=self.session).count() + before_count = Message.objects.filter( + user=self.user, session=self.session + ).count() async_to_sync(history.apply_reaction)( self.user, self.identifier, @@ -96,7 +100,9 @@ class WhatsAppReactionHandlingTests(TestCase): remove=False, payload={"event": "reaction"}, ) - after_count = Message.objects.filter(user=self.user, session=self.session).count() + after_count = Message.objects.filter( + user=self.user, session=self.session + ).count() self.assertEqual(before_count, after_count) self.target.refresh_from_db() @@ -127,7 +133,9 @@ class RecalculateContactAvailabilityTests(TestCase): service="whatsapp", identifier="15557654321@s.whatsapp.net", ) - self.session = ChatSession.objects.create(user=self.user, identifier=self.identifier) + self.session = ChatSession.objects.create( + user=self.user, identifier=self.identifier + ) self.base_ts = now_ms() Message.objects.create( @@ -168,19 +176,25 @@ class RecalculateContactAvailabilityTests(TestCase): return events, spans def test_recalculate_is_deterministic_and_no_skew_on_rerun(self): - call_command("recalculate_contact_availability", "--days", "36500", "--limit", "500") + call_command( + "recalculate_contact_availability", "--days", "36500", "--limit", "500" + ) first_events, first_spans = self._projection() self.assertTrue(first_events) self.assertTrue(first_spans) - call_command("recalculate_contact_availability", "--days", "36500", "--limit", "500") + call_command( + "recalculate_contact_availability", "--days", "36500", "--limit", "500" + ) second_events, second_spans = self._projection() self.assertEqual(first_events, second_events) self.assertEqual(first_spans, second_spans) def test_recalculate_no_reset_does_not_duplicate(self): - call_command("recalculate_contact_availability", "--days", "36500", "--limit", "500") + call_command( + "recalculate_contact_availability", "--days", "36500", "--limit", "500" + ) events_before = ContactAvailabilityEvent.objects.filter(user=self.user).count() spans_before = ContactAvailabilitySpan.objects.filter(user=self.user).count() diff --git a/core/tests/test_xmpp_approval_commands.py b/core/tests/test_xmpp_approval_commands.py index e493ba0..47c2247 100644 --- a/core/tests/test_xmpp_approval_commands.py +++ b/core/tests/test_xmpp_approval_commands.py @@ -1,6 +1,5 @@ from __future__ import annotations -from types import SimpleNamespace from unittest.mock import MagicMock from asgiref.sync import async_to_sync @@ -32,8 +31,12 @@ class _ApprovalProbe: class XMPPGatewayApprovalCommandTests(TestCase): def setUp(self): - self.user = User.objects.create_user("xmpp-approval-user", "xmpp-approval@example.com", "x") - self.project = TaskProject.objects.create(user=self.user, name="Approval Project") + self.user = User.objects.create_user( + "xmpp-approval-user", "xmpp-approval@example.com", "x" + ) + self.project = TaskProject.objects.create( + user=self.user, name="Approval Project" + ) self.task = DerivedTask.objects.create( user=self.user, project=self.project, @@ -59,7 +62,10 @@ class XMPPGatewayApprovalCommandTests(TestCase): source_service="xmpp", source_channel="jews.zm.is", status="waiting_approval", - request_payload={"action": "append_update", "provider_payload": {"task_id": str(self.task.id)}}, + request_payload={ + "action": "append_update", + "provider_payload": {"task_id": str(self.task.id)}, + }, result_payload={}, ) self.request = CodexPermissionRequest.objects.create( @@ -124,7 +130,9 @@ class XMPPGatewayApprovalCommandTests(TestCase): class XMPPGatewayTasksCommandTests(TestCase): def setUp(self): - self.user = User.objects.create_user("xmpp-task-user", "xmpp-task@example.com", "x") + self.user = User.objects.create_user( + "xmpp-task-user", "xmpp-task@example.com", "x" + ) self.project = TaskProject.objects.create(user=self.user, name="Task Project") self.task = DerivedTask.objects.create( user=self.user, diff --git a/core/tests/test_xmpp_integration.py b/core/tests/test_xmpp_integration.py index 188ab69..13e2f37 100644 --- a/core/tests/test_xmpp_integration.py +++ b/core/tests/test_xmpp_integration.py @@ -10,6 +10,7 @@ mirroring exactly the flow a phone XMPP client uses: Tests are skipped automatically when XMPP settings are absent (e.g. in CI environments without a running stack). """ + from __future__ import annotations import base64 @@ -26,11 +27,11 @@ import xml.etree.ElementTree as ET from django.conf import settings from django.test import SimpleTestCase - # --------------------------------------------------------------------------- # Helpers # --------------------------------------------------------------------------- + def _xmpp_configured() -> bool: return bool( getattr(settings, "XMPP_JID", None) @@ -67,10 +68,21 @@ def _xmpp_domain() -> str: def _prosody_auth_endpoint() -> str: """URL of the Django auth bridge that Prosody calls for c2s authentication.""" - return str(getattr(settings, "PROSODY_AUTH_ENDPOINT", "http://127.0.0.1:8090/internal/prosody/auth/")) + return str( + getattr( + settings, + "PROSODY_AUTH_ENDPOINT", + "http://127.0.0.1:8090/internal/prosody/auth/", + ) + ) -def _recv_until(sock: socket.socket, patterns: list[bytes], timeout: float = 8.0, max_bytes: int = 16384) -> bytes: +def _recv_until( + sock: socket.socket, + patterns: list[bytes], + timeout: float = 8.0, + max_bytes: int = 16384, +) -> bytes: """Read from sock until one of the byte patterns appears or timeout/max_bytes hit.""" buf = b"" deadline = time.monotonic() + timeout @@ -91,7 +103,9 @@ def _recv_until(sock: socket.socket, patterns: list[bytes], timeout: float = 8.0 return buf -def _component_handshake(address: str, port: int, jid: str, secret: str, timeout: float = 5.0) -> tuple[bool, str]: +def _component_handshake( + address: str, port: int, jid: str, secret: str, timeout: float = 5.0 +) -> tuple[bool, str]: """ Attempt an XEP-0114 external component handshake. @@ -123,7 +137,9 @@ def _component_handshake(address: str, port: int, jid: str, secret: str, timeout token = hashlib.sha1((stream_id + secret).encode()).hexdigest() sock.sendall(f"{token}".encode()) - response = _recv_until(sock, [b"" in resp_text or "" in resp_text: @@ -146,10 +162,11 @@ def _component_handshake(address: str, port: int, jid: str, secret: str, timeout class _C2SResult: """Return value from _c2s_sasl_auth.""" + def __init__(self, success: bool, stage: str, detail: str): - self.success = success # True = SASL - self.stage = stage # where we got to: tcp/starttls/tls/features/auth - self.detail = detail # human-readable explanation + self.success = success # True = SASL + self.stage = stage # where we got to: tcp/starttls/tls/features/auth + self.detail = detail # human-readable explanation def __repr__(self): return f"" @@ -178,8 +195,8 @@ def _c2s_sasl_auth( 9. Return _C2SResult with (True, "auth") on or (False, "auth") on """ NS_STREAM = "http://etherx.jabber.org/streams" - NS_TLS = "urn:ietf:params:xml:ns:xmpp-tls" - NS_SASL = "urn:ietf:params:xml:ns:xmpp-sasl" + NS_TLS = "urn:ietf:params:xml:ns:xmpp-tls" + NS_SASL = "urn:ietf:params:xml:ns:xmpp-sasl" def stream_open(to: str) -> bytes: return ( @@ -201,19 +218,29 @@ def _c2s_sasl_auth( raw.sendall(stream_open(domain)) # --- Receive pre-TLS features (expect ) --- - buf = _recv_until(raw, [b"", b"", b" in pre-TLS features: {text[:300]}") + return _C2SResult( + False, "starttls", f"No in pre-TLS features: {text[:300]}" + ) # --- Negotiate STARTTLS --- raw.sendall(f"".encode()) buf2 = _recv_until(raw, [b" after STARTTLS request: {text2[:200]}") + return _C2SResult( + False, + "starttls", + f"No after STARTTLS request: {text2[:200]}", + ) # --- Upgrade to TLS --- ctx = ssl.create_default_context() @@ -223,7 +250,9 @@ def _c2s_sasl_auth( try: tls = ctx.wrap_socket(raw, server_hostname=domain) except ssl.SSLCertVerificationError as exc: - return _C2SResult(False, "tls", f"TLS cert verification failed for {domain!r}: {exc}") + return _C2SResult( + False, "tls", f"TLS cert verification failed for {domain!r}: {exc}" + ) except ssl.SSLError as exc: return _C2SResult(False, "tls", f"TLS handshake error: {exc}") @@ -231,23 +260,35 @@ def _c2s_sasl_auth( # --- Re-open stream over TLS --- tls.sendall(stream_open(domain)) - buf3 = _recv_until(tls, [b"", b"", b"([^<]+)", text3, re.IGNORECASE) if not mechanisms: - return _C2SResult(False, "features", f"No SASL mechanisms in post-TLS features: {text3[:300]}") + return _C2SResult( + False, + "features", + f"No SASL mechanisms in post-TLS features: {text3[:300]}", + ) if "PLAIN" not in [m.upper() for m in mechanisms]: - return _C2SResult(False, "features", f"SASL PLAIN not offered; got: {mechanisms}") + return _C2SResult( + False, "features", f"SASL PLAIN not offered; got: {mechanisms}" + ) # --- SASL PLAIN auth --- credential = base64.b64encode(f"\x00{username}\x00{password}".encode()).decode() tls.sendall( f"{credential}".encode() ) - buf4 = _recv_until(tls, [b"]*>\s*<([a-z-]+)", text4) condition = m.group(1) if m else "unknown" - return _C2SResult(False, "auth", f"SASL PLAIN rejected: {condition} — {text4[:200]}") + return _C2SResult( + False, "auth", f"SASL PLAIN rejected: {condition} — {text4[:200]}" + ) if "" "" @@ -114,7 +49,7 @@ class XMPPOmemoObservationPersistenceTests(TestCase): "" ) async_to_sync(XMPPComponent._record_sender_omemo_state)( - probe, + xmpp_component, user, sender_jid="xmpp-omemo-user@zm.is/mobile", recipient_jid="jews.zm.is", @@ -124,3 +59,328 @@ class XMPPOmemoObservationPersistenceTests(TestCase): self.assertEqual("detected", row.status) self.assertEqual("sid:321,rid:654", row.latest_client_key) self.assertEqual("jews.zm.is", row.last_target_jid) + + +class XMPPOmemoEnforcementTests(TestCase): + """Test require_omemo policy enforcement on incoming messages""" + + def setUp(self): + from core.models import UserXmppSecuritySettings + + self.user = User.objects.create_user("omemo-enforcer", "omemo@example.com", "x") + self.security_settings = UserXmppSecuritySettings.objects.create( + user=self.user, require_omemo=True + ) + + def test_plaintext_message_rejected_when_omemo_required(self): + """Test that plaintext messages are rejected when require_omemo=True""" + from core.models import UserXmppSecuritySettings + + # Create a plaintext message stanza (no OMEMO encryption) + stanza_xml = ET.fromstring( + "" + "Hello, world!" + "" + ) + + # Mock the message handler's sym function + sym_calls = [] + + def mock_sym(msg): + sym_calls.append(msg) + + # Verify that security settings require OMEMO + settings = UserXmppSecuritySettings.objects.get(user=self.user) + self.assertTrue(settings.require_omemo) + + # Extract OMEMO observation from plaintext message + omemo_observation = _extract_sender_omemo_client_key( + SimpleNamespace(xml=stanza_xml) + ) + + # Plaintext message should have "no_omemo" status + self.assertEqual("no_omemo", omemo_observation.get("status")) + + # Now test that enforcement would reject this message + # Check condition: if require_omemo is True and status != "detected" + if settings.require_omemo: + omemo_status = str(omemo_observation.get("status") or "") + if omemo_status != "detected": + # This is where the message would be rejected + mock_sym( + "⚠ This gateway requires OMEMO encryption. " + "Your message was not delivered. " + "Please enable OMEMO in your XMPP client." + ) + + # Verify the rejection message was set + self.assertEqual(1, len(sym_calls)) + self.assertIn("This gateway requires OMEMO encryption", sym_calls[0]) + self.assertIn("Your message was not delivered", sym_calls[0]) + self.assertIn("Please enable OMEMO in your XMPP client", sym_calls[0]) + + def test_encrypted_message_accepted_when_omemo_required(self): + """Test that OMEMO-encrypted messages are accepted when require_omemo=True""" + from core.models import UserXmppSecuritySettings + + # Create an OMEMO-encrypted message stanza + stanza_xml = ET.fromstring( + "" + "" + "

    x
    " + "" + "" + ) + + # Extract OMEMO observation from encrypted message + omemo_observation = _extract_sender_omemo_client_key( + SimpleNamespace(xml=stanza_xml) + ) + + # Encrypted message should have "detected" status + self.assertEqual("detected", omemo_observation.get("status")) + + # Verify that security settings require OMEMO + settings = UserXmppSecuritySettings.objects.get(user=self.user) + self.assertTrue(settings.require_omemo) + + # Test that enforcement accepts this message + if settings.require_omemo: + omemo_status = str(omemo_observation.get("status") or "") + if omemo_status != "detected": + # Message would be rejected, but it's not + self.fail("Encrypted message should not be rejected") + + # If we get here, the message was accepted + self.assertTrue(True) + + +class XMPPOmemoDeviceDiscoveryTests(TestCase): + """Test OMEMO device discovery as seen by real XMPP clients (Dino, Gajim).""" + + def setUp(self): + """Set up a mock XMPP component with OMEMO support.""" + self.user = User.objects.create_user( + "device-discovery-user", "dd@example.com", "x" + ) + + # Create a mock XMPP component + self.mock_component = MagicMock() + self.mock_component.log = MagicMock() + self.mock_component.jid = "jews.zm.is" + + def test_gateway_publishes_device_list_to_pubsub(self): + """Test that the gateway publishes its device list to PubSub (XEP-0060). + + This simulates the device discovery query that real XMPP clients perform. + When a client wants to send an OMEMO message, it: + 1. Queries the PubSub node: pubsub.example.com/eu.siacs.conversations.axolotl/devices/jews.zm.is + 2. Expects to receive a device list with at least one device + 3. Retrieves keys for those devices + 4. Encrypts the message + + If the device list is empty or missing, the client shows: + - Dino: "This contact does not support OMEMO encryption" + - Gajim: "No devices found to encrypt this message to. Querying for devices now…" + """ + # This test verifies that devices are published + # In a real scenario, the OMEMO plugin should publish devices during session_start + + # Mock the OMEMO plugin + mock_omemo_plugin = AsyncMock() + + # Create a mock device list response + # Format: list of device objects with device_id and identity_key attributes + mock_own_devices = [ + SimpleNamespace( + device_id=1, identity_key=b"mock_identity_key_123456789abcdef" + ), + ] + + # When session manager is obtained, it should provide access to device info + mock_session_manager = AsyncMock() + mock_session_manager.get_own_device_information = AsyncMock( + return_value=mock_own_devices + ) + + # The plugin's get_session_manager should return the session manager + mock_omemo_plugin.get_session_manager = AsyncMock( + return_value=mock_session_manager + ) + + # Simulate calling get_session_manager (as done in _bootstrap_omemo_for_authentic_channel) + async_to_sync(mock_omemo_plugin.get_session_manager)() + + # Verify the plugin was asked for session manager + mock_omemo_plugin.get_session_manager.assert_called_once() + + def test_client_cannot_encrypt_when_no_devices_found(self): + """Test the error case: client fails to encrypt when gateway has no published devices. + + This reproduces the error from real clients: + - Dino error: "This contact does not support OMEMO encryption" + - Gajim error: "No devices found to encrypt this message to. Querying for devices now…" + + Root cause: Gateway's device list is not being published to PubSub during bootstrap. + """ + # This is what causes the client error + error_reason = ( + "This contact does not support OMEMO encryption (No devices found)" + ) + + # Verify that this error condition matches what we see in real clients + self.assertIn("does not support OMEMO", error_reason) + self.assertIn("No devices", error_reason) + + def test_client_can_encrypt_when_gateway_devices_discovered(self): + """Test successful encryption: client discovers gateway devices and encrypts. + + When the gateway properly publishes devices: + 1. Client queries PubSub device node + 2. Gets back device IDs and keys + 3. Encrypts message to those devices + 4. Sends encrypted message + """ + # Simulate successful device discovery + devices_from_pubsub = [ + {"device_id": 1, "identity_key": "base64_encoded_key_1"}, + ] + + # Client now has devices to encrypt to + can_encrypt = bool(devices_from_pubsub) + encryption_status = "ready" if devices_from_pubsub else "failed" + + self.assertTrue(can_encrypt) + self.assertEqual("ready", encryption_status) + + def test_omemo_state_tracks_client_devices(self): + """Test that gateway tracks which devices clients use for OMEMO. + + Once encryption is working, the gateway should observe and record + which client devices are sending encrypted messages. + """ + # Simulate an OMEMO-encrypted message from a client device + client_stanza = ET.fromstring( + "" + "" + "
    " # Device 12345 + "encrypted_payload_1" # To recipient device 67890 + "encrypted_payload_2" # To recipient device 67891 + "
    " + "encrypted_message_body" + "    " + "    " + ) + + # Extract and verify the client key tracking + omemo_observation = _extract_sender_omemo_client_key( + SimpleNamespace(xml=client_stanza) + ) + + # Should detect OMEMO and extract device info + self.assertEqual("detected", omemo_observation.get("status")) + self.assertIn("sid:12345", omemo_observation.get("client_key", "")) + + # In real gateway flow, this would be persisted to UserXmppOmemoState + # so we can track which clients have working OMEMO + + def test_device_list_publication_requires_pubsub_node(self): + """Test that device list publication fails if PubSub is unavailable. + + The OMEMO bootstrap must: + 1. Initialize the session manager (which auto-creates devices) + 2. Publish device list to PubSub at: eu.siacs.conversations.axolotl/devices/jews.zm.is + 3. Allow clients to discover and query those devices + + If PubSub is slow or unavailable, this times out and prevents + proper device discovery. + """ + # Increased timeout from 15s to 30s to allow PubSub operations + session_manager_init_timeout = 30.0 # seconds + + # If the session manager init times out, device list is never published + # With the increased timeout, we have more time for: + # 1. PubSub node creation/access + # 2. Device list publishing + # 3. Subscription setup + + self.assertGreater(session_manager_init_timeout, 15.0) + + def test_component_jid_device_discovery(self): + """Test that component JIDs (without user@) can publish OMEMO devices. + + A key issue with components: they use JIDs like 'jews.zm.is' instead of + 'user@jews.zm.is'. This affects: + 1. Device list node path: eu.siacs.conversations.axolotl/devices/jews.zm.is + 2. Device identity and trust establishment + 3. How clients discover and encrypt to the component + + The OMEMO plugin must handle component JIDs correctly. + """ + component_jid = "jews.zm.is" + + # Component JID format (no user@ part) + self.assertNotIn("@", component_jid) + + # But PubSub device node still follows standard format + pubsub_node = f"eu.siacs.conversations.axolotl/devices/{component_jid}" + self.assertEqual( + "eu.siacs.conversations.axolotl/devices/jews.zm.is", pubsub_node + ) + + def test_gateway_accepts_presence_subscription_for_omemo(self): + """Test that gateway auto-accepts presence subscriptions for OMEMO device discovery. + + When a client subscribes to the gateway component (jews.zm.is) for OMEMO: + 1. Client sends: + 2. Gateway should auto-accept and send presence availability + 3. This allows the client to add the gateway to its roster + 4. Client can then query PubSub for device lists + """ + # Simulate a client sending presence subscription to gateway + client_jid = "testclient@example.com" + gateway_jid = "jews.zm.is" + + # Create a mock XMPP component with the subscription handler + mock_component = MagicMock() + mock_component.log = MagicMock() + mock_component.boundjid.bare = gateway_jid + mock_component.send_presence = MagicMock() + + # Create mock presence stanza + presence_stanza = MagicMock() + presence_stanza.__getitem__ = lambda self, key: { + "from": client_jid, + "to": gateway_jid, + }.get(key, "") + + # Import the handler from the xmpp module + from core.clients.xmpp import XMPPComponent + + # Call the handler + handler = XMPPComponent.on_presence_subscribe + + # Since it's not an async method, call it directly + handler(mock_component, presence_stanza) + + # Verify that gateway sent subscribed response + calls = mock_component.send_presence.call_args_list + self.assertGreater(len(calls), 0, "Gateway should send presence response") + + # Find the "subscribed" response + subscribed_calls = [ + call + for call in calls + if call.kwargs.get("ptype") == "subscribed" + and call.kwargs.get("pto") == client_jid + ] + self.assertEqual(len(subscribed_calls), 1, "Should send subscribed response") + + # Find the "available" presence notification + available_calls = [ + call + for call in calls + if call.kwargs.get("ptype") == "available" + and call.kwargs.get("pto") == client_jid + ] + self.assertEqual(len(available_calls), 1, "Should send presence availability") diff --git a/core/translation/engine.py b/core/translation/engine.py index 5eaf797..7b7701b 100644 --- a/core/translation/engine.py +++ b/core/translation/engine.py @@ -1,7 +1,6 @@ from __future__ import annotations import hashlib -import time from asgiref.sync import sync_to_async @@ -56,8 +55,7 @@ async def _translate_text(user, text: str, source_lang: str, target_lang: str) - }, ] return str( - await ai_runner.run_prompt(prompt, ai_obj, operation="translation") - or "" + await ai_runner.run_prompt(prompt, ai_obj, operation="translation") or "" ).strip() @@ -130,7 +128,9 @@ async def process_inbound_translation(message: Message): log_row.status = "failed" log_row.error = str(exc) log.warning("translation forward failed bridge=%s: %s", bridge.id, exc) - await sync_to_async(log_row.save)(update_fields=["status", "error", "updated_at"]) + await sync_to_async(log_row.save)( + update_fields=["status", "error", "updated_at"] + ) def apply_translation_origin(meta: dict | None, origin_tag: str) -> dict: diff --git a/core/util/django_settings_export.py b/core/util/django_settings_export.py index b31fe40..b13f5dd 100644 --- a/core/util/django_settings_export.py +++ b/core/util/django_settings_export.py @@ -4,6 +4,7 @@ Export Django settings to templates https://github.com/jakubroztocil/django-settings-export """ + from django.conf import settings as django_settings from django.core.exceptions import ImproperlyConfigured diff --git a/core/views/ais.py b/core/views/ais.py index d634d9f..167879e 100644 --- a/core/views/ais.py +++ b/core/views/ais.py @@ -1,10 +1,10 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.urls import reverse -from mixins.views import ObjectCreate, ObjectDelete, ObjectList, ObjectUpdate from core.forms import AIForm from core.models import AI from core.util import logs +from mixins.views import ObjectCreate, ObjectDelete, ObjectList, ObjectUpdate log = logs.get_logger(__name__) diff --git a/core/views/automation.py b/core/views/automation.py index 38c2ed8..7981f24 100644 --- a/core/views/automation.py +++ b/core/views/automation.py @@ -11,7 +11,11 @@ from django.urls import reverse from django.utils import timezone from django.views import View -from core.commands.policies import BP_VARIANT_KEYS, BP_VARIANT_META, ensure_variant_policies_for_profile +from core.commands.policies import ( + BP_VARIANT_KEYS, + BP_VARIANT_META, + ensure_variant_policies_for_profile, +) from core.models import ( AIRunLog, BusinessPlanDocument, @@ -56,7 +60,9 @@ class CommandRoutingSettings(LoginRequiredMixin, View): @staticmethod def _redirect_with_scope(request): - service = str(request.GET.get("service") or request.POST.get("service") or "").strip() + service = str( + request.GET.get("service") or request.POST.get("service") or "" + ).strip() identifier = str( request.GET.get("identifier") or request.POST.get("identifier") or "" ).strip() @@ -94,11 +100,14 @@ class CommandRoutingSettings(LoginRequiredMixin, View): { "variant_key": key, "variant_label": str(meta.get("name") or key), - "trigger_token": str(meta.get("trigger_token") or profile.trigger_token or ""), + "trigger_token": str( + meta.get("trigger_token") or profile.trigger_token or "" + ), "template_supported": bool(meta.get("template_supported")), "warn_verbatim_plan": bool( key in {"bp", "bp_set_range"} - and str(getattr(row, "generation_mode", "") or "") == "verbatim" + and str(getattr(row, "generation_mode", "") or "") + == "verbatim" and bool(getattr(row, "send_plan_to_egress", False)) ), "row": row, @@ -119,7 +128,9 @@ class CommandRoutingSettings(LoginRequiredMixin, View): for row in bindings if str(row.direction or "").strip() == "egress" and bool(row.enabled) ] - profile.preview_mode = preview_profile_id and str(profile.id) == preview_profile_id + profile.preview_mode = ( + preview_profile_id and str(profile.id) == preview_profile_id + ) documents = BusinessPlanDocument.objects.filter(user=request.user).order_by( "-updated_at" )[:30] @@ -147,7 +158,9 @@ class CommandRoutingSettings(LoginRequiredMixin, View): if action == "profile_create": slug = ( - str(request.POST.get("command_slug") or request.POST.get("slug") or "bp") + str( + request.POST.get("command_slug") or request.POST.get("slug") or "bp" + ) .strip() .lower() or "bp" @@ -156,7 +169,10 @@ class CommandRoutingSettings(LoginRequiredMixin, View): user=request.user, slug=slug, defaults={ - "name": str(request.POST.get("name") or ("Codex" if slug == "codex" else "Business Plan")).strip() + "name": str( + request.POST.get("name") + or ("Codex" if slug == "codex" else "Business Plan") + ).strip() or ("Codex" if slug == "codex" else "Business Plan"), "enabled": True, "trigger_token": str( @@ -167,10 +183,14 @@ class CommandRoutingSettings(LoginRequiredMixin, View): "template_text": str(request.POST.get("template_text") or ""), }, ) - profile.name = str(request.POST.get("name") or profile.name).strip() or profile.name + profile.name = ( + str(request.POST.get("name") or profile.name).strip() or profile.name + ) if slug == "bp": profile.trigger_token = ".bp" - profile.template_text = str(request.POST.get("template_text") or profile.template_text or "") + profile.template_text = str( + request.POST.get("template_text") or profile.template_text or "" + ) if slug == "codex": profile.trigger_token = ".codex" profile.reply_required = False @@ -317,11 +337,17 @@ class CommandRoutingSettings(LoginRequiredMixin, View): variant_key=variant_key, ) policy.enabled = bool(request.POST.get("enabled")) - mode = str(request.POST.get("generation_mode") or "verbatim").strip().lower() + mode = ( + str(request.POST.get("generation_mode") or "verbatim").strip().lower() + ) policy.generation_mode = mode if mode in {"ai", "verbatim"} else "verbatim" policy.send_plan_to_egress = bool(request.POST.get("send_plan_to_egress")) - policy.send_status_to_source = bool(request.POST.get("send_status_to_source")) - policy.send_status_to_egress = bool(request.POST.get("send_status_to_egress")) + policy.send_status_to_source = bool( + request.POST.get("send_status_to_source") + ) + policy.send_status_to_egress = bool( + request.POST.get("send_status_to_egress") + ) policy.store_document = bool(request.POST.get("store_document")) policy.save() return self._redirect_with_scope(request) @@ -343,7 +369,9 @@ class CommandRoutingSettings(LoginRequiredMixin, View): user=request.user, ) ensure_variant_policies_for_profile(profile) - service = str(request.GET.get("service") or request.POST.get("service") or "").strip() + service = str( + request.GET.get("service") or request.POST.get("service") or "" + ).strip() identifier = str( request.GET.get("identifier") or request.POST.get("identifier") or "" ).strip() @@ -391,18 +419,14 @@ class TranslationSettings(LoginRequiredMixin, View): request.POST.get("a_channel_identifier") or "" ).strip(), a_language=str( - request.POST.get("a_language") - or inferred.get("a_language") - or "en" + request.POST.get("a_language") or inferred.get("a_language") or "en" ).strip(), b_service=str(request.POST.get("b_service") or "web").strip(), b_channel_identifier=str( request.POST.get("b_channel_identifier") or "" ).strip(), b_language=str( - request.POST.get("b_language") - or inferred.get("b_language") - or "en" + request.POST.get("b_language") or inferred.get("b_language") or "en" ).strip(), direction=str(request.POST.get("direction") or "bidirectional").strip(), quick_mode_title=quick_title, @@ -434,7 +458,9 @@ class AIExecutionLogSettings(LoginRequiredMixin, View): total_ok = runs_qs.filter(status="ok").count() total_failed = runs_qs.filter(status="failed").count() avg_ms = runs_qs.aggregate(v=Avg("duration_ms")).get("v") or 0 - success_rate = (float(total_ok) / float(total_runs) * 100.0) if total_runs else 0.0 + success_rate = ( + (float(total_ok) / float(total_runs) * 100.0) if total_runs else 0.0 + ) usage_totals = runs_qs.aggregate( prompt_chars_total=Sum("prompt_chars"), @@ -531,6 +557,53 @@ class AIExecutionRunDetailTabView(LoginRequiredMixin, View): ) +class BusinessPlanInbox(LoginRequiredMixin, View): + template_name = "pages/business-plan-inbox.html" + + def get(self, request): + status_filter = str(request.GET.get("status") or "").strip().lower() + service_filter = str(request.GET.get("service") or "").strip().lower() + query = str(request.GET.get("q") or "").strip() + + rows = ( + BusinessPlanDocument.objects.filter(user=request.user) + .select_related("command_profile") + .annotate(revision_count=Count("revisions")) + .order_by("-updated_at") + ) + if status_filter in {"draft", "final"}: + rows = rows.filter(status=status_filter) + if service_filter in {"xmpp", "whatsapp", "signal", "instagram", "web"}: + rows = rows.filter(source_service=service_filter) + if query: + rows = rows.filter( + Q(title__icontains=query) + | Q(source_channel_identifier__icontains=query) + | Q(command_profile__name__icontains=query) + ) + + stats = BusinessPlanDocument.objects.filter(user=request.user).aggregate( + total=Count("id"), + draft=Count("id", filter=Q(status="draft")), + final=Count("id", filter=Q(status="final")), + ) + + return render( + request, + self.template_name, + { + "documents": rows[:250], + "filters": { + "status": status_filter, + "service": service_filter, + "q": query, + }, + "stats": stats, + "service_choices": ("xmpp", "whatsapp", "signal", "instagram", "web"), + }, + ) + + class BusinessPlanEditor(LoginRequiredMixin, View): template_name = "pages/business-plan-editor.html" diff --git a/core/views/availability.py b/core/views/availability.py index 8359b72..63bb77b 100644 --- a/core/views/availability.py +++ b/core/views/availability.py @@ -72,9 +72,7 @@ class AvailabilitySettingsPage(LoginRequiredMixin, View): .values("person_id", "person__name", "service") .annotate( total_events=Count("id"), - available_events=Count( - "id", filter=Q(availability_state="available") - ), + available_events=Count("id", filter=Q(availability_state="available")), fading_events=Count("id", filter=Q(availability_state="fading")), unavailable_events=Count( "id", filter=Q(availability_state="unavailable") @@ -86,13 +84,11 @@ class AvailabilitySettingsPage(LoginRequiredMixin, View): read_receipt_events=Count("id", filter=Q(source_kind="read_receipt")), typing_events=Count( "id", - filter=Q(source_kind="typing_start") - | Q(source_kind="typing_stop"), + filter=Q(source_kind="typing_start") | Q(source_kind="typing_stop"), ), message_activity_events=Count( "id", - filter=Q(source_kind="message_in") - | Q(source_kind="message_out"), + filter=Q(source_kind="message_in") | Q(source_kind="message_out"), ), inferred_timeout_events=Count( "id", filter=Q(source_kind="inferred_timeout") diff --git a/core/views/compose.py b/core/views/compose.py index e9d1141..0dd1b27 100644 --- a/core/views/compose.py +++ b/core/views/compose.py @@ -25,27 +25,26 @@ from django.urls import NoReverseMatch, reverse from django.utils import timezone as dj_timezone from django.views import View -from core.clients import transport from core.assist.engine import process_inbound_assist +from core.clients import transport from core.commands.base import CommandContext from core.commands.engine import process_inbound_message from core.commands.policies import ensure_variant_policies_for_profile from core.events.ledger import append_event_sync from core.messaging import ai as ai_runner -from core.messaging import history -from core.messaging import media_bridge +from core.messaging import history, media_bridge from core.messaging.utils import messages_to_string from core.models import ( AI, Chat, ChatSession, + ChatTaskSource, CommandAction, CommandChannelBinding, CommandProfile, Message, MessageEvent, PatternMitigationPlan, - ChatTaskSource, Person, PersonIdentifier, PlatformChatLink, @@ -54,8 +53,8 @@ from core.models import ( from core.presence import get_settings as get_availability_settings from core.presence import latest_state_for_people, spans_for_range from core.realtime.typing_state import get_person_typing_state -from core.transports.capabilities import supports, unsupported_reason from core.translation.engine import process_inbound_translation +from core.transports.capabilities import supports, unsupported_reason from core.views.workspace import ( INSIGHT_METRICS, _build_engage_payload, @@ -234,11 +233,7 @@ def _compose_availability_payload( range_end: int, ) -> tuple[bool, list[dict], dict]: settings_row = get_availability_settings(user) - if ( - person is None - or not settings_row.enabled - or not settings_row.show_in_chat - ): + if person is None or not settings_row.enabled or not settings_row.show_in_chat: return False, [], {} service_key = str(service or "").strip().lower() @@ -735,7 +730,9 @@ def _serialize_message(msg: Message) -> dict: ), "reply_preview": reply_preview, "message_meta": { - "origin_tag": str((getattr(msg, "message_meta", {}) or {}).get("origin_tag") or "") + "origin_tag": str( + (getattr(msg, "message_meta", {}) or {}).get("origin_tag") or "" + ) }, } @@ -998,9 +995,11 @@ def _build_gap_fragment(is_outgoing_reply, lag_ms, snapshot): if snapshot is not None: score_value = getattr( snapshot, - "outbound_response_score" - if is_outgoing_reply - else "inbound_response_score", + ( + "outbound_response_score" + if is_outgoing_reply + else "inbound_response_score" + ), None, ) if score_value is None: @@ -1383,9 +1382,9 @@ def _trend_meta(current, previous, higher_is_better=True): improves = is_up if higher_is_better else not is_up return { "direction": "up" if is_up else "down", - "icon": "fa-solid fa-arrow-trend-up" - if is_up - else "fa-solid fa-arrow-trend-down", + "icon": ( + "fa-solid fa-arrow-trend-up" if is_up else "fa-solid fa-arrow-trend-down" + ), "class_name": "has-text-success" if improves else "has-text-danger", "meaning": "Improving signal" if improves else "Risk signal", } @@ -1872,7 +1871,9 @@ def _latest_signal_bridge_ref(message: Message | None) -> dict: return best -def _build_whatsapp_reply_metadata(reply_to: Message | None, channel_identifier: str) -> dict: +def _build_whatsapp_reply_metadata( + reply_to: Message | None, channel_identifier: str +) -> dict: if reply_to is None: return {} target_message_id = "" @@ -1880,13 +1881,17 @@ def _build_whatsapp_reply_metadata(reply_to: Message | None, channel_identifier: source_service = str(getattr(reply_to, "source_service", "") or "").strip().lower() if source_service == "whatsapp": - target_message_id = str(getattr(reply_to, "source_message_id", "") or "").strip() + target_message_id = str( + getattr(reply_to, "source_message_id", "") or "" + ).strip() participant = str(getattr(reply_to, "sender_uuid", "") or "").strip() if not target_message_id: bridge_ref = _latest_whatsapp_bridge_ref(reply_to) target_message_id = str(bridge_ref.get("upstream_message_id") or "").strip() - participant = participant or str(bridge_ref.get("upstream_author") or "").strip() + participant = ( + participant or str(bridge_ref.get("upstream_author") or "").strip() + ) if not target_message_id: return {} @@ -1902,7 +1907,9 @@ def _build_whatsapp_reply_metadata(reply_to: Message | None, channel_identifier: } -def _build_signal_reply_metadata(reply_to: Message | None, channel_identifier: str) -> dict: +def _build_signal_reply_metadata( + reply_to: Message | None, channel_identifier: str +) -> dict: if reply_to is None: return {} @@ -1933,10 +1940,13 @@ def _build_signal_reply_metadata(reply_to: Message | None, channel_identifier: s if source_chat_id: quote_author = source_chat_id if ( - str(getattr(reply_to, "custom_author", "") or "").strip().upper() in {"USER", "BOT"} + str(getattr(reply_to, "custom_author", "") or "").strip().upper() + in {"USER", "BOT"} or not quote_author ): - quote_author = str(getattr(settings, "SIGNAL_NUMBER", "") or "").strip() or quote_author + quote_author = ( + str(getattr(settings, "SIGNAL_NUMBER", "") or "").strip() or quote_author + ) if not quote_author: quote_author = source_chat_id if not quote_author: @@ -1969,9 +1979,13 @@ def _reaction_actor_key(user_id, service: str) -> str: return f"web:{int(user_id)}:{str(service or '').strip().lower()}" -def _resolve_reaction_target(message: Message, service: str, channel_identifier: str) -> dict: +def _resolve_reaction_target( + message: Message, service: str, channel_identifier: str +) -> dict: service_key = _default_service(service) - message_source_service = str(getattr(message, "source_service", "") or "").strip().lower() + message_source_service = ( + str(getattr(message, "source_service", "") or "").strip().lower() + ) source_message_id = str(getattr(message, "source_message_id", "") or "").strip() sender_uuid = str(getattr(message, "sender_uuid", "") or "").strip() source_chat_id = str(getattr(message, "source_chat_id", "") or "").strip() @@ -1998,12 +2012,13 @@ def _resolve_reaction_target(message: Message, service: str, channel_identifier: target_author = sender_uuid if not target_author: target_author = str(bridge_ref.get("upstream_author") or "").strip() - if ( - str(getattr(message, "custom_author", "") or "").strip().upper() - in {"USER", "BOT"} - ): + if str(getattr(message, "custom_author", "") or "").strip().upper() in { + "USER", + "BOT", + }: target_author = ( - str(getattr(settings, "SIGNAL_NUMBER", "") or "").strip() or target_author + str(getattr(settings, "SIGNAL_NUMBER", "") or "").strip() + or target_author ) if not target_author: target_author = source_chat_id or str(channel_identifier or "").strip() @@ -2017,7 +2032,9 @@ def _resolve_reaction_target(message: Message, service: str, channel_identifier: } if service_key == "whatsapp": - target_message_id = source_message_id if message_source_service == "whatsapp" else "" + target_message_id = ( + source_message_id if message_source_service == "whatsapp" else "" + ) target_ts = delivered_ts or local_ts bridge_ref = _latest_whatsapp_bridge_ref(message) if not target_message_id: @@ -2123,7 +2140,9 @@ def _toggle_command_for_channel( enabled: bool, ) -> tuple[bool, str]: service_key = _default_service(service) - canonical_identifier = _canonical_command_channel_identifier(service_key, identifier) + canonical_identifier = _canonical_command_channel_identifier( + service_key, identifier + ) if not canonical_identifier: return (False, "missing_identifier") @@ -2133,9 +2152,7 @@ def _toggle_command_for_channel( profile = _ensure_codex_profile(user) else: profile = ( - CommandProfile.objects.filter(user=user, slug=slug) - .order_by("id") - .first() + CommandProfile.objects.filter(user=user, slug=slug).order_by("id").first() ) if profile is None: return (False, f"unknown_command:{slug}") @@ -2178,9 +2195,7 @@ def _toggle_command_for_channel( def _command_options_for_channel(user, service: str, identifier: str) -> list[dict]: service_key = _default_service(service) variants = _command_channel_identifier_variants(service_key, identifier) - profiles = list( - CommandProfile.objects.filter(user=user).order_by("slug", "id") - ) + profiles = list(CommandProfile.objects.filter(user=user).order_by("slug", "id")) by_slug = {str(row.slug or "").strip(): row for row in profiles} if "bp" not in by_slug: by_slug["bp"] = CommandProfile( @@ -2212,7 +2227,9 @@ def _command_options_for_channel(user, service: str, identifier: str) -> list[di enabled=True, ).exists() if slug == "bp": - policies = ensure_variant_policies_for_profile(profile) if profile.id else {} + policies = ( + ensure_variant_policies_for_profile(profile) if profile.id else {} + ) label_by_key = { "bp": "bp", "bp_set": "bp set", @@ -2228,7 +2245,11 @@ def _command_options_for_channel(user, service: str, identifier: str) -> list[di "enabled_here": bool(enabled_here), "profile_enabled": bool(profile.enabled), "mode_label": str( - (policies.get("bp").generation_mode if policies.get("bp") else "ai") + ( + policies.get("bp").generation_mode + if policies.get("bp") + else "ai" + ) ).upper(), }, { @@ -2239,7 +2260,11 @@ def _command_options_for_channel(user, service: str, identifier: str) -> list[di "enabled_here": bool(enabled_here), "profile_enabled": bool(profile.enabled), "mode_label": str( - (policies.get("bp_set").generation_mode if policies.get("bp_set") else "verbatim") + ( + policies.get("bp_set").generation_mode + if policies.get("bp_set") + else "verbatim" + ) ).upper(), }, { @@ -2261,7 +2286,9 @@ def _command_options_for_channel(user, service: str, identifier: str) -> list[di ) for row in options: if row.get("slug") in label_by_key: - row["enabled_label"] = "Enabled" if row.get("enabled_here") else "Disabled" + row["enabled_label"] = ( + "Enabled" if row.get("enabled_here") else "Disabled" + ) else: options.append( { @@ -2283,11 +2310,7 @@ def _bp_binding_summary_for_channel(user, service: str, identifier: str) -> dict variants = _command_channel_identifier_variants(service_key, identifier) if not variants: return {"ingress_count": 0, "egress_count": 0} - profile = ( - CommandProfile.objects.filter(user=user, slug="bp") - .order_by("id") - .first() - ) + profile = CommandProfile.objects.filter(user=user, slug="bp").order_by("id").first() if profile is None: return {"ingress_count": 0, "egress_count": 0} ingress_count = CommandChannelBinding.objects.filter( @@ -2315,7 +2338,9 @@ def _toggle_task_announce_for_channel( enabled: bool, ) -> tuple[bool, str]: service_key = _default_service(service) - canonical_identifier = _canonical_command_channel_identifier(service_key, identifier) + canonical_identifier = _canonical_command_channel_identifier( + service_key, identifier + ) if not canonical_identifier: return (False, "missing_identifier") variants = _command_channel_identifier_variants(service_key, canonical_identifier) @@ -3411,7 +3436,9 @@ class ComposeContactCreateAll(LoginRequiredMixin, View): skipped_count += 1 if errors: - message = f"Created {created_count} contacts. Errors: {'; '.join(errors[:5])}" + message = ( + f"Created {created_count} contacts. Errors: {'; '.join(errors[:5])}" + ) level = "warning" elif created_count > 0: message = f"Created {created_count} new contact{'s' if created_count != 1 else ''}. Skipped {skipped_count}." @@ -3538,7 +3565,9 @@ class ComposeThread(LoginRequiredMixin, View): counterpart_identifiers = _counterpart_identifiers_for_person( request.user, base["person"] ) - range_start = int(messages[0].ts or 0) if messages else max(0, int(after_ts or 0)) + range_start = ( + int(messages[0].ts or 0) if messages else max(0, int(after_ts or 0)) + ) range_end = int(latest_ts or 0) if range_start <= 0 or range_end <= 0: now_ts = int(time.time() * 1000) @@ -3947,7 +3976,9 @@ class ComposeToggleCommand(LoginRequiredMixin, View): service, str(identifier or "") ) if not channel_identifier: - return JsonResponse({"ok": False, "error": "missing_identifier"}, status=400) + return JsonResponse( + {"ok": False, "error": "missing_identifier"}, status=400 + ) if service not in {"web", "xmpp", "signal", "whatsapp"}: return JsonResponse( {"ok": False, "error": f"unsupported_service:{service}"}, @@ -3996,9 +4027,7 @@ class ComposeToggleCommand(LoginRequiredMixin, View): if enabled else f"{slug} disabled for this chat." ) - scoped_settings_url = ( - f"{reverse('command_routing')}?{urlencode({'service': service, 'identifier': channel_identifier})}" - ) + scoped_settings_url = f"{reverse('command_routing')}?{urlencode({'service': service, 'identifier': channel_identifier})}" return JsonResponse( { "ok": True, @@ -4014,6 +4043,7 @@ class ComposeToggleCommand(LoginRequiredMixin, View): } ) + class ComposeBindBP(ComposeToggleCommand): def post(self, request): service, identifier, _ = _request_scope(request, "POST") @@ -4296,9 +4326,11 @@ class ComposeQuickInsights(LoginRequiredMixin, View): or conversation.get_stability_state_display(), "stability_state": conversation.get_stability_state_display(), "thread": conversation.platform_thread_id or "", - "last_event": _format_ts_label(conversation.last_event_ts or 0) - if conversation.last_event_ts - else "", + "last_event": ( + _format_ts_label(conversation.last_event_ts or 0) + if conversation.last_event_ts + else "" + ), "last_ai_run": ( dj_timezone.localtime(conversation.last_ai_run_at).strftime( "%Y-%m-%d %H:%M" @@ -4607,11 +4639,15 @@ class ComposeSend(LoginRequiredMixin, View): log_prefix = ( f"[ComposeSend] service={base['service']} identifier={base['identifier']}" ) - if bool(getattr(settings, "CAPABILITY_ENFORCEMENT_ENABLED", True)) and not supports( + if bool( + getattr(settings, "CAPABILITY_ENFORCEMENT_ENABLED", True) + ) and not supports( str(base["service"] or "").strip().lower(), "send", ): - reason = unsupported_reason(str(base["service"] or "").strip().lower(), "send") + reason = unsupported_reason( + str(base["service"] or "").strip().lower(), "send" + ) return self._response( request, ok=False, @@ -4786,7 +4822,9 @@ class ComposeSend(LoginRequiredMixin, View): source_chat_id=str(base["identifier"] or ""), reply_to=reply_to, reply_source_service="web" if reply_to is not None else None, - reply_source_message_id=str(reply_to.id) if reply_to is not None else None, + reply_source_message_id=( + str(reply_to.id) if reply_to is not None else None + ), message_meta={}, ) try: @@ -4858,7 +4896,9 @@ class ComposeReact(LoginRequiredMixin, View): service_key = _default_service(service) if service_key not in {"signal", "whatsapp"}: return JsonResponse({"ok": False, "error": "service_not_supported"}) - if bool(getattr(settings, "CAPABILITY_ENFORCEMENT_ENABLED", True)) and not supports(service_key, "reactions"): + if bool( + getattr(settings, "CAPABILITY_ENFORCEMENT_ENABLED", True) + ) and not supports(service_key, "reactions"): return JsonResponse( { "ok": False, diff --git a/core/views/groups.py b/core/views/groups.py index 01d5802..a19e674 100644 --- a/core/views/groups.py +++ b/core/views/groups.py @@ -1,10 +1,10 @@ from django.contrib.auth.mixins import LoginRequiredMixin -from mixins.views import ObjectCreate, ObjectDelete, ObjectUpdate from core.forms import GroupForm from core.models import Group from core.util import logs from core.views.osint import OSINTListBase +from mixins.views import ObjectCreate, ObjectDelete, ObjectUpdate log = logs.get_logger(__name__) diff --git a/core/views/identifiers.py b/core/views/identifiers.py index 41d9db4..b22f83f 100644 --- a/core/views/identifiers.py +++ b/core/views/identifiers.py @@ -1,10 +1,10 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.db import IntegrityError -from mixins.views import AbortSave, ObjectCreate, ObjectDelete, ObjectList, ObjectUpdate from core.forms import PersonIdentifierForm from core.models import Person, PersonIdentifier from core.util import logs +from mixins.views import AbortSave, ObjectCreate, ObjectDelete, ObjectList, ObjectUpdate log = logs.get_logger(__name__) diff --git a/core/views/manipulations.py b/core/views/manipulations.py index e116335..d215e3a 100644 --- a/core/views/manipulations.py +++ b/core/views/manipulations.py @@ -1,10 +1,10 @@ from django.contrib.auth.mixins import LoginRequiredMixin -from mixins.views import ObjectCreate, ObjectDelete, ObjectUpdate from core.forms import ManipulationForm from core.models import Manipulation from core.util import logs from core.views.osint import OSINTListBase +from mixins.views import ObjectCreate, ObjectDelete, ObjectUpdate log = logs.get_logger(__name__) diff --git a/core/views/messages.py b/core/views/messages.py index 31161e5..0ae0763 100644 --- a/core/views/messages.py +++ b/core/views/messages.py @@ -1,10 +1,10 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.db import IntegrityError -from mixins.views import AbortSave, ObjectCreate, ObjectDelete, ObjectList, ObjectUpdate from core.forms import MessageForm from core.models import Message from core.util import logs +from mixins.views import AbortSave, ObjectCreate, ObjectDelete, ObjectList, ObjectUpdate log = logs.get_logger(__name__) diff --git a/core/views/notifications.py b/core/views/notifications.py index 3ef96a0..4946ffa 100644 --- a/core/views/notifications.py +++ b/core/views/notifications.py @@ -1,8 +1,8 @@ from django.contrib.auth.mixins import LoginRequiredMixin -from mixins.views import ObjectUpdate from core.forms import NotificationSettingsForm from core.models import NotificationSettings +from mixins.views import ObjectUpdate # Notifications - we create a new notification settings object if there isn't one diff --git a/core/views/osint.py b/core/views/osint.py index ec817d9..af0609d 100644 --- a/core/views/osint.py +++ b/core/views/osint.py @@ -1,9 +1,10 @@ from __future__ import annotations -from dataclasses import dataclass, field -from datetime import date, datetime, timezone as dt_timezone -from decimal import Decimal, InvalidOperation import re +from dataclasses import dataclass, field +from datetime import date, datetime +from datetime import timezone as dt_timezone +from decimal import Decimal, InvalidOperation from typing import Any, Callable from urllib.parse import urlencode @@ -17,9 +18,9 @@ from django.shortcuts import render from django.urls import reverse from django.utils import timezone from django.views import View -from mixins.views import ObjectList -from core.models import Group, Manipulation, Message, Person, PersonIdentifier, Persona +from core.models import Group, Manipulation, Message, Person, Persona, PersonIdentifier +from mixins.views import ObjectList _QUERY_MAX_LEN = 400 _QUERY_ALLOWED_PATTERN = re.compile(r"[\w\s@\-\+\.:,#/]+", re.UNICODE) @@ -907,7 +908,9 @@ class OSINTSearch(LoginRequiredMixin, View): reverse=_safe_query_param(request, "reverse", "") in {"1", "true", "on"}, ) - def _parse_date_boundaries(self, plan: "OSINTSearch.SearchPlan") -> tuple[datetime | None, datetime | None]: + def _parse_date_boundaries( + self, plan: "OSINTSearch.SearchPlan" + ) -> tuple[datetime | None, datetime | None]: parsed_from = None parsed_to = None if plan.date_from: @@ -921,7 +924,9 @@ class OSINTSearch(LoginRequiredMixin, View): except ValueError: parsed_to = None if parsed_to is not None: - parsed_to = parsed_to.replace(hour=23, minute=59, second=59, microsecond=999999) + parsed_to = parsed_to.replace( + hour=23, minute=59, second=59, microsecond=999999 + ) return parsed_from, parsed_to def _score_hit(self, query: str, primary: str, secondary: str) -> int: @@ -1138,7 +1143,9 @@ class OSINTSearch(LoginRequiredMixin, View): elif scope_key == "identifiers": queryset = queryset.filter(service=plan.source) elif scope_key == "people": - queryset = queryset.filter(personidentifier__service=plan.source).distinct() + queryset = queryset.filter( + personidentifier__service=plan.source + ).distinct() if scope_key == "messages": if date_from is not None: @@ -1195,7 +1202,9 @@ class OSINTSearch(LoginRequiredMixin, View): | Q(likes__icontains=query) | Q(dislikes__icontains=query) ) - for item in people_qs.order_by("-last_interaction", "name")[:per_scope_limit]: + for item in people_qs.order_by("-last_interaction", "name")[ + :per_scope_limit + ]: secondary = self._snippet( f"{item.summary or ''} {item.profile or ''}".strip(), query if plan.annotate else "", @@ -1208,13 +1217,17 @@ class OSINTSearch(LoginRequiredMixin, View): "secondary": secondary or (item.timezone or ""), "service": "-", "when": item.last_interaction, - "score": self._score_hit(query, item.name or "", secondary or ""), + "score": self._score_hit( + query, item.name or "", secondary or "" + ), } ) if "identifiers" in allowed_scopes: identifiers_qs = self._apply_common_filters( - PersonIdentifier.objects.filter(user=request.user).select_related("person"), + PersonIdentifier.objects.filter(user=request.user).select_related( + "person" + ), "identifiers", plan, ) @@ -1224,7 +1237,9 @@ class OSINTSearch(LoginRequiredMixin, View): | Q(person__name__icontains=query) | Q(service__icontains=query) ) - for item in identifiers_qs.order_by("person__name", "identifier")[:per_scope_limit]: + for item in identifiers_qs.order_by("person__name", "identifier")[ + :per_scope_limit + ]: primary = item.person.name if item.person_id else item.identifier secondary = item.identifier if item.person_id else "" base_score = self._score_hit(query, primary or "", secondary or "") @@ -1261,8 +1276,14 @@ class OSINTSearch(LoginRequiredMixin, View): continue if date_to and when_dt and when_dt > date_to: continue - primary = item.custom_author or item.sender_uuid or (item.source_chat_id or "Message") - secondary = self._snippet(item.text or "", query if plan.annotate else "") + primary = ( + item.custom_author + or item.sender_uuid + or (item.source_chat_id or "Message") + ) + secondary = self._snippet( + item.text or "", query if plan.annotate else "" + ) base_score = self._score_hit(query, primary or "", item.text or "") recency_boost = self._message_recency_boost(when_dt) rows.append( @@ -1458,11 +1479,41 @@ class OSINTSearch(LoginRequiredMixin, View): page_obj = paginator.get_page(request.GET.get("page")) column_context = [ - {"key": "scope", "field_name": "scope", "label": "Type", "sortable": False, "kind": "text"}, - {"key": "primary", "field_name": "primary", "label": "Primary", "sortable": False, "kind": "text"}, - {"key": "secondary", "field_name": "secondary", "label": "Details", "sortable": False, "kind": "text"}, - {"key": "service", "field_name": "service", "label": "Service", "sortable": False, "kind": "text"}, - {"key": "when", "field_name": "when", "label": "When", "sortable": False, "kind": "datetime"}, + { + "key": "scope", + "field_name": "scope", + "label": "Type", + "sortable": False, + "kind": "text", + }, + { + "key": "primary", + "field_name": "primary", + "label": "Primary", + "sortable": False, + "kind": "text", + }, + { + "key": "secondary", + "field_name": "secondary", + "label": "Details", + "sortable": False, + "kind": "text", + }, + { + "key": "service", + "field_name": "service", + "label": "Service", + "sortable": False, + "kind": "text", + }, + { + "key": "when", + "field_name": "when", + "label": "When", + "sortable": False, + "kind": "datetime", + }, ] rows = [] for item in list(page_obj.object_list): diff --git a/core/views/people.py b/core/views/people.py index 6937908..427f1bc 100644 --- a/core/views/people.py +++ b/core/views/people.py @@ -1,10 +1,10 @@ from django.contrib.auth.mixins import LoginRequiredMixin -from mixins.views import ObjectCreate, ObjectDelete, ObjectUpdate from core.forms import PersonForm from core.models import Person from core.util import logs from core.views.osint import OSINTListBase +from mixins.views import ObjectCreate, ObjectDelete, ObjectUpdate log = logs.get_logger(__name__) diff --git a/core/views/personas.py b/core/views/personas.py index 0a27bff..6f63d98 100644 --- a/core/views/personas.py +++ b/core/views/personas.py @@ -1,10 +1,10 @@ from django.contrib.auth.mixins import LoginRequiredMixin -from mixins.views import ObjectCreate, ObjectDelete, ObjectUpdate from core.forms import PersonaForm from core.models import Persona from core.util import logs from core.views.osint import OSINTListBase +from mixins.views import ObjectCreate, ObjectDelete, ObjectUpdate log = logs.get_logger(__name__) diff --git a/core/views/queues.py b/core/views/queues.py index 2cee57f..3a94831 100644 --- a/core/views/queues.py +++ b/core/views/queues.py @@ -5,13 +5,13 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.db import transaction from django.http import HttpResponse from django.utils import timezone as dj_timezone -from mixins.views import ObjectCreate, ObjectDelete, ObjectList, ObjectUpdate from rest_framework import status from rest_framework.views import APIView from core.forms import QueueForm from core.models import Message, QueuedMessage from core.util import logs +from mixins.views import ObjectCreate, ObjectDelete, ObjectList, ObjectUpdate log = logs.get_logger("queue") _INLINE_TARGET_RE = re.compile(r"^#queue-inline-editor-[A-Za-z0-9_-]+$") @@ -77,7 +77,7 @@ class RejectMessageAPI(LoginRequiredMixin, APIView): class QueueList(LoginRequiredMixin, ObjectList): list_template = "partials/queue-list.html" model = QueuedMessage - page_title = "Queue" + page_title = "Approvals Queue" list_url_name = "queues" list_url_args = ["type"] diff --git a/core/views/sessions.py b/core/views/sessions.py index 9cda79e..8eb89db 100644 --- a/core/views/sessions.py +++ b/core/views/sessions.py @@ -1,9 +1,9 @@ from django.contrib.auth.mixins import LoginRequiredMixin -from mixins.views import ObjectCreate, ObjectDelete, ObjectList, ObjectUpdate from core.forms import SessionForm from core.models import ChatSession from core.util import logs +from mixins.views import ObjectCreate, ObjectDelete, ObjectList, ObjectUpdate log = logs.get_logger(__name__) diff --git a/core/views/signal.py b/core/views/signal.py index 8a0a7b0..24cb45f 100644 --- a/core/views/signal.py +++ b/core/views/signal.py @@ -8,13 +8,13 @@ from django.db.models import Q from django.shortcuts import render from django.urls import reverse from django.views import View -from mixins.views import ObjectList, ObjectRead from core.clients import transport from core.models import Chat, PersonIdentifier, PlatformChatLink from core.presence import get_settings as get_availability_settings from core.presence import latest_state_for_people from core.views.manage.permissions import SuperUserRequiredMixin +from mixins.views import ObjectList, ObjectRead def _safe_json_list(text_value): @@ -102,11 +102,13 @@ class SignalAccounts(SuperUserRequiredMixin, ObjectList): "show_contact_actions": show_contact_actions, "contacts_url_name": f"{service}_contacts", "chats_url_name": f"{service}_chats", - "endpoint_base": str( - getattr(settings, "SIGNAL_HTTP_URL", "http://signal:8080") - ).rstrip("/") - if service == "signal" - else "", + "endpoint_base": ( + str(getattr(settings, "SIGNAL_HTTP_URL", "http://signal:8080")).rstrip( + "/" + ) + if service == "signal" + else "" + ), "service_warning": transport.get_service_warning(service), } @@ -392,7 +394,7 @@ class SignalChatsList(SuperUserRequiredMixin, ObjectList): class SignalMessagesList(SuperUserRequiredMixin, ObjectList): - ... + pass class SignalAccountAdd(SuperUserRequiredMixin, CustomObjectRead): diff --git a/core/views/system.py b/core/views/system.py index 8fc776f..a19d5cd 100644 --- a/core/views/system.py +++ b/core/views/system.py @@ -7,6 +7,8 @@ from django.urls import reverse from django.views import View from core.clients import transport +from core.events.projection import shadow_compare_session +from core.memory.search_backend import backend_status, get_memory_search_backend from core.models import ( AdapterHealthEvent, AIRequest, @@ -14,6 +16,7 @@ from core.models import ( AIResultSignal, Chat, ChatSession, + CommandSecurityPolicy, ConversationEvent, Group, MemoryItem, @@ -30,15 +33,13 @@ from core.models import ( Persona, PersonIdentifier, QueuedMessage, - CommandSecurityPolicy, UserAccessibilitySettings, UserXmppOmemoState, + UserXmppOmemoTrustedKey, UserXmppSecuritySettings, WorkspaceConversation, WorkspaceMetricSnapshot, ) -from core.events.projection import shadow_compare_session -from core.memory.search_backend import backend_status, get_memory_search_backend from core.transports.capabilities import capability_snapshot from core.views.manage.permissions import SuperUserRequiredMixin @@ -53,7 +54,9 @@ class SystemSettings(SuperUserRequiredMixin, View): "queued_messages": QueuedMessage.objects.filter(user=user).count(), "message_events": MessageEvent.objects.filter(user=user).count(), "conversation_events": ConversationEvent.objects.filter(user=user).count(), - "adapter_health_events": AdapterHealthEvent.objects.filter(user=user).count(), + "adapter_health_events": AdapterHealthEvent.objects.filter( + user=user + ).count(), "workspace_conversations": WorkspaceConversation.objects.filter( user=user ).count(), @@ -472,7 +475,41 @@ def _parse_xmpp_jid(jid_str: str) -> dict: raw = str(jid_str or "").strip() bare, _, resource = raw.partition("/") localpart, _, domain = bare.partition("@") - return {"full": raw, "bare": bare, "localpart": localpart, "domain": domain, "resource": resource} + return { + "full": raw, + "bare": bare, + "localpart": localpart, + "domain": domain, + "resource": resource, + } + + +def _parse_omemo_client_key(client_key: str) -> dict: + raw = str(client_key or "").strip() + parts = {} + for row in raw.split(","): + key, _, value = str(row or "").partition(":") + k = key.strip().lower() + v = value.strip() + if k and v: + parts[k] = v + sid = str(parts.get("sid") or "").strip() + rid = str(parts.get("rid") or "").strip() + return { + "raw": raw, + "sid": sid, + "rid": rid, + "has_ids": bool(sid or rid), + } + + +def _latest_client_omemo_fingerprint(omemo_row) -> str: + if omemo_row is None: + return "" + details = getattr(omemo_row, "details", {}) or {} + if not isinstance(details, dict): + return "" + return str(details.get("latest_client_fingerprint") or "").strip() def _to_bool(value, default=False): @@ -505,12 +542,36 @@ class SecurityPage(LoginRequiredMixin, View): "require_trusted_fingerprint", ) POLICY_SCOPES = [ - ("gateway.tasks", "Gateway .tasks commands", "Handles .tasks list/show/complete/undo over gateway channels."), - ("gateway.approval", "Gateway approval commands", "Handles .approval/.codex/.claude approve/deny over gateway channels."), - ("gateway.totp", "Gateway TOTP enrollment", "Controls TOTP enrollment/status commands over gateway channels."), - ("tasks.submit", "Task submissions from chat", "Controls automatic task creation from inbound messages."), - ("tasks.commands", "Task command verbs (.task/.undo/.epic)", "Controls explicit task command verbs."), - ("command.bp", "Business plan command", "Controls Business Plan command execution."), + ( + "gateway.tasks", + "Gateway .tasks commands", + "Handles .tasks list/show/complete/undo over gateway channels.", + ), + ( + "gateway.approval", + "Gateway approval commands", + "Handles .approval/.codex/.claude approve/deny over gateway channels.", + ), + ( + "gateway.totp", + "Gateway TOTP enrollment", + "Controls TOTP enrollment/status commands over gateway channels.", + ), + ( + "tasks.submit", + "Task submissions from chat", + "Controls automatic task creation from inbound messages.", + ), + ( + "tasks.commands", + "Task command verbs (.task/.undo/.epic)", + "Controls explicit task command verbs.", + ), + ( + "command.bp", + "Business plan command", + "Controls Business Plan command execution.", + ), ("command.codex", "Codex command", "Controls Codex command execution."), ("command.claude", "Claude command", "Controls Claude command execution."), ] @@ -538,6 +599,77 @@ class SecurityPage(LoginRequiredMixin, View): row, _ = UserXmppSecuritySettings.objects.get_or_create(user=request.user) return row + def _omemo_discovered_keys(self, request, xmpp_state, omemo_row): + discovered = [] + + sender = _parse_xmpp_jid(getattr(omemo_row, "last_sender_jid", "") or "") + client_jid = str(sender.get("bare") or "").strip() + client_fingerprint = _latest_client_omemo_fingerprint(omemo_row) + client_key = str(getattr(omemo_row, "latest_client_key", "") or "").strip() + if client_jid and client_fingerprint: + discovered.append( + { + "jid": client_jid, + "key_type": "fingerprint", + "key_id": client_fingerprint, + "source": "client_observed", + "label": "Observed client fingerprint", + } + ) + elif client_jid and client_key: + discovered.append( + { + "jid": client_jid, + "key_type": "client_key", + "key_id": client_key, + "source": "client_observed", + "label": "Observed client key", + } + ) + + # De-duplicate while preserving order. + deduped = [] + seen = set() + for row in discovered: + key = ( + str(row.get("jid") or "").strip().lower(), + str(row.get("key_type") or "").strip().lower(), + str(row.get("key_id") or "").strip(), + ) + if key in seen: + continue + seen.add(key) + deduped.append(row) + discovered = deduped + + trusted_map = {} + rows = UserXmppOmemoTrustedKey.objects.filter(user=request.user) + for item in rows: + trusted_map[ + ( + str(item.jid or "").strip().lower(), + str(item.key_type or "").strip().lower(), + str(item.key_id or "").strip(), + ) + ] = item + + payload = [] + for row in discovered: + map_key = ( + str(row.get("jid") or "").strip().lower(), + str(row.get("key_type") or "").strip().lower(), + str(row.get("key_id") or "").strip(), + ) + existing = trusted_map.get(map_key) + payload.append( + { + **row, + "trusted": bool(getattr(existing, "trusted", False)), + "updated_at": getattr(existing, "updated_at", None), + } + ) + return payload + def _parse_override_value(self, value): option = str(value or "").strip().lower() if option == "inherit": @@ -604,10 +736,12 @@ class SecurityPage(LoginRequiredMixin, View): for pattern in patterns: pattern_text = str(pattern or "").strip() if pattern_text: - rows.append({ - "service": service_name, - "pattern": pattern_text, - }) + rows.append( + { + "service": service_name, + "pattern": pattern_text, + } + ) return rows def _channels_map_from_post(self, request): @@ -618,9 +752,11 @@ class SecurityPage(LoginRequiredMixin, View): pattern = str(raw_pattern or "").strip() if not pattern: continue - service_name = str( - channel_services[idx] if idx < len(channel_services) else "" - ).strip().lower() + service_name = ( + str(channel_services[idx] if idx < len(channel_services) else "") + .strip() + .lower() + ) if not service_name: service_name = "*" allowed_channels.setdefault(service_name, []) @@ -652,41 +788,42 @@ class SecurityPage(LoginRequiredMixin, View): if not channel_rules: channel_rules = [{"service": "xmpp", "pattern": ""}] enabled_locked = global_overrides["scope_enabled"] != "per_scope" - require_omemo_locked = ( - global_overrides["require_omemo"] != "per_scope" - or bool(security_settings.require_omemo) - ) + require_omemo_locked = global_overrides[ + "require_omemo" + ] != "per_scope" or bool(security_settings.require_omemo) require_trusted_locked = ( global_overrides["require_trusted_fingerprint"] != "per_scope" ) - payload.append({ - "scope_key": key, - "label": label, - "description": description, - "enabled": self._apply_global_override( - bool(getattr(item, "enabled", True)), - global_overrides["scope_enabled"], - ), - "require_omemo": self._apply_global_override( - bool(getattr(item, "require_omemo", False)), - global_overrides["require_omemo"], - ), - "require_trusted_fingerprint": self._apply_global_override( - bool(getattr(item, "require_trusted_omemo_fingerprint", False)), - global_overrides["require_trusted_fingerprint"], - ), - "enabled_locked": enabled_locked, - "require_omemo_locked": require_omemo_locked, - "require_trusted_fingerprint_locked": require_trusted_locked, - "lock_help": "Set this field to 'Per Scope' in Global Scope Override to edit it here.", - "require_omemo_lock_help": ( - "Disable 'Require OMEMO encryption' in Encryption settings to edit this field." - if bool(security_settings.require_omemo) - else "Set this field to 'Per Scope' in Global Scope Override to edit it here." - ), - "allowed_services": raw_allowed_services, - "channel_rules": channel_rules, - }) + payload.append( + { + "scope_key": key, + "label": label, + "description": description, + "enabled": self._apply_global_override( + bool(getattr(item, "enabled", True)), + global_overrides["scope_enabled"], + ), + "require_omemo": self._apply_global_override( + bool(getattr(item, "require_omemo", False)), + global_overrides["require_omemo"], + ), + "require_trusted_fingerprint": self._apply_global_override( + bool(getattr(item, "require_trusted_omemo_fingerprint", False)), + global_overrides["require_trusted_fingerprint"], + ), + "enabled_locked": enabled_locked, + "require_omemo_locked": require_omemo_locked, + "require_trusted_fingerprint_locked": require_trusted_locked, + "lock_help": "Set this field to 'Per Scope' in Global Scope Override to edit it here.", + "require_omemo_lock_help": ( + "Disable 'Require OMEMO encryption' in Encryption settings to edit this field." + if bool(security_settings.require_omemo) + else "Set this field to 'Per Scope' in Global Scope Override to edit it here." + ), + "allowed_services": raw_allowed_services, + "channel_rules": channel_rules, + } + ) return payload def _scope_group_key(self, scope_key: str) -> str: @@ -725,18 +862,52 @@ class SecurityPage(LoginRequiredMixin, View): items = grouped.get(group_key) or [] if not items: continue - payload.append({ - "key": group_key, - "label": self.POLICY_GROUP_LABELS.get(group_key, group_key.title()), - "rows": items, - }) + payload.append( + { + "key": group_key, + "label": self.POLICY_GROUP_LABELS.get(group_key, group_key.title()), + "rows": items, + } + ) return payload def post(self, request): row = self._security_settings(request) - if "require_omemo" in request.POST: + if str(request.POST.get("encryption_settings_submit") or "").strip() == "1": row.require_omemo = _to_bool(request.POST.get("require_omemo"), False) - row.save(update_fields=["require_omemo", "updated_at"]) + row.encrypt_contact_messages_with_omemo = _to_bool( + request.POST.get("encrypt_contact_messages_with_omemo"), + False, + ) + row.save( + update_fields=[ + "require_omemo", + "encrypt_contact_messages_with_omemo", + "updated_at", + ] + ) + if "omemo_trust_update" in request.POST: + key_type = ( + str(request.POST.get("key_type") or "fingerprint").strip().lower() + ) + if key_type not in {"fingerprint", "client_key"}: + key_type = "fingerprint" + jid = str(request.POST.get("jid") or "").strip() + key_id = str(request.POST.get("key_id") or "").strip() + source = str(request.POST.get("source") or "").strip().lower() + trusted = _to_bool(request.POST.get("trusted"), False) + if jid and key_id: + trust_row, _ = UserXmppOmemoTrustedKey.objects.get_or_create( + user=request.user, + jid=jid, + key_type=key_type, + key_id=key_id, + defaults={"source": source}, + ) + trust_row.trusted = trusted + if source: + trust_row.source = source + trust_row.save(update_fields=["trusted", "source", "updated_at"]) redirect_to = HttpResponseRedirect(request.path) scope_key = str(request.POST.get("scope_key") or "").strip().lower() if not self._show_permission(): @@ -787,9 +958,8 @@ class SecurityPage(LoginRequiredMixin, View): policy.allowed_channels = allowed_channels if global_overrides["scope_enabled"] == "per_scope": policy.enabled = _to_bool(request.POST.get("policy_enabled"), True) - if ( - global_overrides["require_omemo"] == "per_scope" - and not bool(security_settings.require_omemo) + if global_overrides["require_omemo"] == "per_scope" and not bool( + security_settings.require_omemo ): policy.require_omemo = _to_bool( request.POST.get("policy_require_omemo"), False @@ -821,8 +991,15 @@ class SecurityPage(LoginRequiredMixin, View): omemo_row = UserXmppOmemoState.objects.get(user=request.user) except UserXmppOmemoState.DoesNotExist: omemo_row = None + discovered_omemo_keys = self._omemo_discovered_keys( + request, xmpp_state, omemo_row + ) security_settings = self._security_settings(request) sender_jid = _parse_xmpp_jid(getattr(omemo_row, "last_sender_jid", "") or "") + omemo_client_fingerprint = _latest_client_omemo_fingerprint(omemo_row) + omemo_client_key_info = _parse_omemo_client_key( + getattr(omemo_row, "latest_client_key", "") if omemo_row else "" + ) omemo_plan = [] if show_encryption: omemo_plan = [ @@ -847,19 +1024,26 @@ class SecurityPage(LoginRequiredMixin, View): "hint": "Enable 'Require OMEMO encryption' in Security Policy above to enforce this policy.", }, ] - return render(request, self.template_name, { - "xmpp_state": xmpp_state, - "omemo_row": omemo_row, - "security_settings": security_settings, - "global_override": self._global_override_payload(request), - "policy_services": self.POLICY_SERVICES, - "policy_rows": self._scope_rows(request), - "policy_groups": self._grouped_scope_rows(request), - "sender_jid": sender_jid, - "omemo_plan": omemo_plan, - "show_encryption": show_encryption, - "show_permission": show_permission, - }) + return render( + request, + self.template_name, + { + "xmpp_state": xmpp_state, + "omemo_row": omemo_row, + "discovered_omemo_keys": discovered_omemo_keys, + "security_settings": security_settings, + "global_override": self._global_override_payload(request), + "policy_services": self.POLICY_SERVICES, + "policy_rows": self._scope_rows(request), + "policy_groups": self._grouped_scope_rows(request), + "sender_jid": sender_jid, + "omemo_client_fingerprint": omemo_client_fingerprint, + "omemo_client_key_info": omemo_client_key_info, + "omemo_plan": omemo_plan, + "show_encryption": show_encryption, + "show_permission": show_permission, + }, + ) class AccessibilitySettings(LoginRequiredMixin, View): @@ -870,9 +1054,13 @@ class AccessibilitySettings(LoginRequiredMixin, View): return row def get(self, request): - return render(request, self.template_name, { - "accessibility_settings": self._row(request), - }) + return render( + request, + self.template_name, + { + "accessibility_settings": self._row(request), + }, + ) def post(self, request): row = self._row(request) @@ -892,20 +1080,26 @@ class _SettingsCategoryPage(LoginRequiredMixin, View): current_path = str(getattr(self.request, "path", "") or "") rows = [] for label, href in self.tabs: - rows.append({ - "label": label, - "href": href, - "active": current_path == href, - }) + rows.append( + { + "label": label, + "href": href, + "active": current_path == href, + } + ) return rows def get(self, request): - return render(request, self.template_name, { - "category_key": self.category_key, - "category_title": self.category_title, - "category_description": self.category_description, - "category_tabs": self._tab_rows(), - }) + return render( + request, + self.template_name, + { + "category_key": self.category_key, + "category_title": self.category_title, + "category_description": self.category_description, + "category_tabs": self._tab_rows(), + }, + ) class AISettingsPage(LoginRequiredMixin, View): diff --git a/core/views/tasks.py b/core/views/tasks.py index 4c3391a..bea0db8 100644 --- a/core/views/tasks.py +++ b/core/views/tasks.py @@ -1,7 +1,7 @@ from __future__ import annotations -import json import hashlib +import json from urllib.parse import urlencode from asgiref.sync import async_to_sync @@ -9,40 +9,40 @@ from django.contrib import messages from django.contrib.auth.mixins import LoginRequiredMixin from django.db import IntegrityError from django.db.models import Count -from django.urls import reverse from django.http import JsonResponse from django.shortcuts import get_object_or_404, redirect, render +from django.urls import reverse from django.utils import timezone from django.views import View from core.clients.transport import send_message_raw from core.models import ( AnswerSuggestionEvent, + Chat, ChatTaskSource, CodexPermissionRequest, CodexRun, DerivedTask, - DerivedTaskEvent, + ExternalChatLink, ExternalSyncEvent, + Person, + PersonIdentifier, + PlatformChatLink, TaskCompletionPattern, TaskEpic, TaskProject, TaskProviderConfig, - PersonIdentifier, - Person, - PlatformChatLink, - Chat, - ExternalChatLink, ) -from core.tasks.codex_support import resolve_external_chat_id from core.tasks.chat_defaults import ( SAFE_TASK_FLAGS_DEFAULTS, ensure_default_source_for_chat, normalize_channel_identifier, ) from core.tasks.codex_approval import queue_codex_event_with_pre_approval +from core.tasks.codex_support import resolve_external_chat_id from core.tasks.providers import get_provider + def _to_bool(raw, default=False) -> bool: if raw is None: return bool(default) @@ -88,13 +88,30 @@ def _normalized_safe_flags(raw: dict | None) -> dict: merged = dict(defaults) merged.update( { - "derive_enabled": _to_bool(row.get("derive_enabled"), defaults["derive_enabled"]), - "match_mode": str(row.get("match_mode") or defaults["match_mode"]).strip().lower() or defaults["match_mode"], - "require_prefix": _to_bool(row.get("require_prefix"), defaults["require_prefix"]), - "allowed_prefixes": _parse_prefixes(",".join(list(row.get("allowed_prefixes") or defaults["allowed_prefixes"]))), - "completion_enabled": _to_bool(row.get("completion_enabled"), defaults["completion_enabled"]), - "ai_title_enabled": _to_bool(row.get("ai_title_enabled"), defaults["ai_title_enabled"]), - "announce_task_id": _to_bool(row.get("announce_task_id"), defaults["announce_task_id"]), + "derive_enabled": _to_bool( + row.get("derive_enabled"), defaults["derive_enabled"] + ), + "match_mode": str(row.get("match_mode") or defaults["match_mode"]) + .strip() + .lower() + or defaults["match_mode"], + "require_prefix": _to_bool( + row.get("require_prefix"), defaults["require_prefix"] + ), + "allowed_prefixes": _parse_prefixes( + ",".join( + list(row.get("allowed_prefixes") or defaults["allowed_prefixes"]) + ) + ), + "completion_enabled": _to_bool( + row.get("completion_enabled"), defaults["completion_enabled"] + ), + "ai_title_enabled": _to_bool( + row.get("ai_title_enabled"), defaults["ai_title_enabled"] + ), + "announce_task_id": _to_bool( + row.get("announce_task_id"), defaults["announce_task_id"] + ), "min_chars": max(1, int(row.get("min_chars") or defaults["min_chars"])), } ) @@ -117,17 +134,45 @@ def _apply_safe_defaults_for_user(user) -> None: def _flags_from_post(request, prefix: str = "") -> dict: - key = lambda name: f"{prefix}{name}" if prefix else name + def key(name: str) -> str: + return f"{prefix}{name}" if prefix else name + defaults = dict(SAFE_TASK_FLAGS_DEFAULTS) return { - "derive_enabled": _to_bool(request.POST.get(key("derive_enabled")), defaults["derive_enabled"]), - "match_mode": str(request.POST.get(key("match_mode")) or defaults["match_mode"]).strip().lower() or defaults["match_mode"], - "require_prefix": _to_bool(request.POST.get(key("require_prefix")), defaults["require_prefix"]), - "allowed_prefixes": _parse_prefixes(str(request.POST.get(key("allowed_prefixes")) or ",".join(defaults["allowed_prefixes"]))), - "completion_enabled": _to_bool(request.POST.get(key("completion_enabled")), defaults["completion_enabled"]), - "ai_title_enabled": _to_bool(request.POST.get(key("ai_title_enabled")), defaults["ai_title_enabled"]), - "announce_task_id": _to_bool(request.POST.get(key("announce_task_id")), defaults["announce_task_id"]), - "min_chars": max(1, int(str(request.POST.get(key("min_chars")) or str(defaults["min_chars"])).strip() or str(defaults["min_chars"]))), + "derive_enabled": _to_bool( + request.POST.get(key("derive_enabled")), defaults["derive_enabled"] + ), + "match_mode": str(request.POST.get(key("match_mode")) or defaults["match_mode"]) + .strip() + .lower() + or defaults["match_mode"], + "require_prefix": _to_bool( + request.POST.get(key("require_prefix")), defaults["require_prefix"] + ), + "allowed_prefixes": _parse_prefixes( + str( + request.POST.get(key("allowed_prefixes")) + or ",".join(defaults["allowed_prefixes"]) + ) + ), + "completion_enabled": _to_bool( + request.POST.get(key("completion_enabled")), defaults["completion_enabled"] + ), + "ai_title_enabled": _to_bool( + request.POST.get(key("ai_title_enabled")), defaults["ai_title_enabled"] + ), + "announce_task_id": _to_bool( + request.POST.get(key("announce_task_id")), defaults["announce_task_id"] + ), + "min_chars": max( + 1, + int( + str( + request.POST.get(key("min_chars")) or str(defaults["min_chars"]) + ).strip() + or str(defaults["min_chars"]) + ), + ), } @@ -136,10 +181,16 @@ def _flags_with_defaults(raw: dict | None) -> dict: def _settings_redirect(request): - service = str(request.POST.get("prefill_service") or request.GET.get("service") or "").strip() - identifier = str(request.POST.get("prefill_identifier") or request.GET.get("identifier") or "").strip() + service = str( + request.POST.get("prefill_service") or request.GET.get("service") or "" + ).strip() + identifier = str( + request.POST.get("prefill_identifier") or request.GET.get("identifier") or "" + ).strip() if service and identifier: - return redirect(f"{request.path}?{urlencode({'service': service, 'identifier': identifier})}") + return redirect( + f"{request.path}?{urlencode({'service': service, 'identifier': identifier})}" + ) return redirect("tasks_settings") @@ -147,7 +198,9 @@ def _ensure_default_completion_patterns(user) -> None: defaults = ("done", "completed", "fixed") existing = set( str(row or "").strip().lower() - for row in TaskCompletionPattern.objects.filter(user=user).values_list("phrase", flat=True) + for row in TaskCompletionPattern.objects.filter(user=user).values_list( + "phrase", flat=True + ) ) next_pos = TaskCompletionPattern.objects.filter(user=user).count() for phrase in defaults: @@ -198,7 +251,14 @@ def _format_task_event_payload(raw_payload): if isinstance(payload, dict): summary = [] - preferred = ("source", "reason", "reaction", "emoji", "presence", "last_seen_ts") + preferred = ( + "source", + "reason", + "reaction", + "emoji", + "presence", + "last_seen_ts", + ) for key in preferred: if key in payload: summary.append((key, str(payload.get(key)))) @@ -253,7 +313,9 @@ def _creator_label_for_message(user, service: str, message) -> str: .first() ) if person_identifier is not None: - person_name = str(getattr(person_identifier.person, "name", "") or "").strip() + person_name = str( + getattr(person_identifier.person, "name", "") or "" + ).strip() if person_name: return person_name return sender_identifier @@ -270,7 +332,10 @@ def _apply_task_creator_labels(user, task_rows): person_identifier_cache: dict[tuple[str, str], PersonIdentifier | None] = {} def _resolve_person_identifier(service_key: str, sender_identifier: str): - key = (str(service_key or "").strip().lower(), str(sender_identifier or "").strip()) + key = ( + str(service_key or "").strip().lower(), + str(sender_identifier or "").strip(), + ) if key in person_identifier_cache: return person_identifier_cache[key] variants = _person_identifier_scope_variants(key[0], key[1]) @@ -294,13 +359,20 @@ def _apply_task_creator_labels(user, task_rows): row.creator_identifier = sender_identifier row.creator_compose_href = "" if sender_identifier and service_key: - person_identifier = _resolve_person_identifier(service_key, sender_identifier) + person_identifier = _resolve_person_identifier( + service_key, sender_identifier + ) compose_service = service_key compose_identifier = sender_identifier compose_person_id = "" if person_identifier is not None: - compose_identifier = str(getattr(person_identifier, "identifier", "") or "").strip() or sender_identifier - compose_person_id = str(getattr(person_identifier, "person_id", "") or "") + compose_identifier = ( + str(getattr(person_identifier, "identifier", "") or "").strip() + or sender_identifier + ) + compose_person_id = str( + getattr(person_identifier, "person_id", "") or "" + ) query = { "service": compose_service, "identifier": compose_identifier, @@ -331,7 +403,8 @@ def _codex_settings_with_defaults(raw: dict | None) -> dict: "default_profile": str(row.get("default_profile") or "").strip(), "timeout_seconds": timeout_seconds, "chat_link_mode": "task-sync", - "instance_label": str(row.get("instance_label") or "default").strip() or "default", + "instance_label": str(row.get("instance_label") or "default").strip() + or "default", "approver_service": str(row.get("approver_service") or "").strip().lower(), "approver_identifier": str(row.get("approver_identifier") or "").strip(), "approver_mode": "channel", @@ -399,16 +472,20 @@ def _enqueue_codex_task_submission( source_channel=str(source_channel or ""), external_chat_id=external_chat_id, status="waiting_approval", - request_payload={"action": "append_update", "provider_payload": dict(provider_payload)}, + request_payload={ + "action": "append_update", + "provider_payload": dict(provider_payload), + }, result_payload={}, error="", ) provider_payload["codex_run_id"] = str(run.id) - run.request_payload = {"action": "append_update", "provider_payload": dict(provider_payload)} + run.request_payload = { + "action": "append_update", + "provider_payload": dict(provider_payload), + } run.save(update_fields=["request_payload", "updated_at"]) - idempotency_key = ( - f"codex_submit:{task.id}:{mode}:{hashlib.sha1(str(command_text or '').encode('utf-8')).hexdigest()[:10]}:{run.id}" - ) + idempotency_key = f"codex_submit:{task.id}:{mode}:{hashlib.sha1(str(command_text or '').encode('utf-8')).hexdigest()[:10]}:{run.id}" queue_codex_event_with_pre_approval( user=user, run=run, @@ -422,7 +499,9 @@ def _enqueue_codex_task_submission( return run -def _upsert_group_source(*, user, service: str, channel_identifier: str, project, epic=None): +def _upsert_group_source( + *, user, service: str, channel_identifier: str, project, epic=None +): normalized_service = str(service or "").strip().lower() normalized_identifier = normalize_channel_identifier(service, channel_identifier) if not normalized_service or not normalized_identifier: @@ -452,7 +531,9 @@ def _upsert_group_source(*, user, service: str, channel_identifier: str, project return source -def _notify_epic_created_in_project_chats(*, project: TaskProject, epic: TaskEpic) -> None: +def _notify_epic_created_in_project_chats( + *, project: TaskProject, epic: TaskEpic +) -> None: rows = ( ChatTaskSource.objects.filter(project=project, enabled=True) .order_by("service", "channel_identifier") @@ -487,7 +568,9 @@ def _notify_epic_created_in_project_chats(*, project: TaskProject, epic: TaskEpi continue -def _reseed_chat_sources_for_deleted_project(user, service_channel_rows: list[tuple[str, str]]) -> int: +def _reseed_chat_sources_for_deleted_project( + user, service_channel_rows: list[tuple[str, str]] +) -> int: restored = 0 seen: set[tuple[str, str]] = set() for service, channel_identifier in service_channel_rows: @@ -641,9 +724,8 @@ def _resolve_channel_display(user, service: str, identifier: str) -> dict: display_identifier = raw_identifier if group_link: - display_identifier = ( - str(group_link.chat_jid or "").strip() - or (f"{bare_identifier}@g.us" if bare_identifier else raw_identifier) + display_identifier = str(group_link.chat_jid or "").strip() or ( + f"{bare_identifier}@g.us" if bare_identifier else raw_identifier ) return { "service_key": service_key, @@ -658,15 +740,23 @@ class TasksHub(LoginRequiredMixin, View): template_name = "pages/tasks-hub.html" def _scope(self, request): - person_id = str(request.GET.get("person") or request.POST.get("person") or "").strip() + person_id = str( + request.GET.get("person") or request.POST.get("person") or "" + ).strip() person = None if person_id: person = Person.objects.filter(user=request.user, id=person_id).first() return { "person": person, "person_id": str(getattr(person, "id", "") or ""), - "service": str(request.GET.get("service") or request.POST.get("service") or "").strip().lower(), - "identifier": str(request.GET.get("identifier") or request.POST.get("identifier") or "").strip(), + "service": str( + request.GET.get("service") or request.POST.get("service") or "" + ) + .strip() + .lower(), + "identifier": str( + request.GET.get("identifier") or request.POST.get("identifier") or "" + ).strip(), "selected_project_id": str( request.GET.get("project") or request.POST.get("project_id") or "" ).strip(), @@ -674,7 +764,10 @@ class TasksHub(LoginRequiredMixin, View): def _context(self, request): scope = self._scope(request) - show_empty = bool(str(request.GET.get("show_empty") or "").strip() in {"1", "true", "yes", "on"}) + show_empty = bool( + str(request.GET.get("show_empty") or "").strip() + in {"1", "true", "yes", "on"} + ) all_projects = ( TaskProject.objects.filter(user=request.user) .annotate( @@ -693,7 +786,9 @@ class TasksHub(LoginRequiredMixin, View): tasks = _apply_task_creator_labels(request.user, tasks) selected_project = None if scope["selected_project_id"]: - selected_project = all_projects.filter(id=scope["selected_project_id"]).first() + selected_project = all_projects.filter( + id=scope["selected_project_id"] + ).first() person_identifiers = [] person_identifier_rows = [] if scope["person"] is not None: @@ -704,8 +799,9 @@ class TasksHub(LoginRequiredMixin, View): ).order_by("service", "identifier") ) mapping_pairs = set( - ChatTaskSource.objects.filter(user=request.user) - .values_list("project_id", "service", "channel_identifier") + ChatTaskSource.objects.filter(user=request.user).values_list( + "project_id", "service", "channel_identifier" + ) ) for row in person_identifiers: mapped = False @@ -759,7 +855,9 @@ class TasksHub(LoginRequiredMixin, View): defaults={"external_key": external_key}, ) except IntegrityError: - messages.error(request, "Could not create project due to duplicate name.") + messages.error( + request, "Could not create project due to duplicate name." + ) return redirect("tasks_hub") if created: messages.success(request, f"Created project '{project.name}'.") @@ -825,10 +923,14 @@ class TasksHub(LoginRequiredMixin, View): f"Delete cancelled. Type the project name exactly to confirm deletion: {expected}", ) return redirect("tasks_hub") - mapped_channels = list(project.chat_sources.values_list("service", "channel_identifier")) + mapped_channels = list( + project.chat_sources.values_list("service", "channel_identifier") + ) deleted_name = str(project.name or "").strip() or "Project" project.delete() - restored = _reseed_chat_sources_for_deleted_project(request.user, mapped_channels) + restored = _reseed_chat_sources_for_deleted_project( + request.user, mapped_channels + ) if restored > 0: messages.success( request, @@ -893,7 +995,9 @@ class TaskProjectDetail(LoginRequiredMixin, View): return redirect("tasks_project", project_id=str(project.id)) if action == "epic_delete": - epic = get_object_or_404(TaskEpic, id=request.POST.get("epic_id"), project=project) + epic = get_object_or_404( + TaskEpic, id=request.POST.get("epic_id"), project=project + ) deleted_name = str(epic.name or "").strip() or "Epic" epic.delete() messages.success(request, f"Deleted epic '{deleted_name}'.") @@ -913,7 +1017,9 @@ class TaskProjectDetail(LoginRequiredMixin, View): task.epic = epic task.save(update_fields=["epic"]) if epic is None: - messages.success(request, f"Cleared epic for task #{task.reference_code}.") + messages.success( + request, f"Cleared epic for task #{task.reference_code}." + ) else: messages.success( request, @@ -930,10 +1036,14 @@ class TaskProjectDetail(LoginRequiredMixin, View): f"Delete cancelled. Type the project name exactly to confirm deletion: {expected}", ) return redirect("tasks_project", project_id=str(project.id)) - mapped_channels = list(project.chat_sources.values_list("service", "channel_identifier")) + mapped_channels = list( + project.chat_sources.values_list("service", "channel_identifier") + ) deleted_name = str(project.name or "").strip() or "Project" project.delete() - restored = _reseed_chat_sources_for_deleted_project(request.user, mapped_channels) + restored = _reseed_chat_sources_for_deleted_project( + request.user, mapped_channels + ) if restored > 0: messages.success( request, @@ -983,8 +1093,9 @@ class TaskGroupDetail(LoginRequiredMixin, View): ) if seeded is not None: mappings = list( - ChatTaskSource.objects.filter(id=seeded.id) - .select_related("project", "epic") + ChatTaskSource.objects.filter(id=seeded.id).select_related( + "project", "epic" + ) ) for row in mappings: row_channel = _resolve_channel_display( @@ -992,9 +1103,9 @@ class TaskGroupDetail(LoginRequiredMixin, View): str(getattr(row, "service", "") or ""), str(getattr(row, "channel_identifier", "") or ""), ) - row.display_service_label = row_channel.get("service_label") or _service_label( - str(getattr(row, "service", "") or "") - ) + row.display_service_label = row_channel.get( + "service_label" + ) or _service_label(str(getattr(row, "service", "") or "")) row.display_channel_name = ( str(row_channel.get("display_name") or "").strip() or str(channel.get("display_name") or "").strip() @@ -1018,7 +1129,9 @@ class TaskGroupDetail(LoginRequiredMixin, View): "service_label": channel["service_label"], "identifier": channel["display_identifier"], "channel_display_name": channel["display_name"], - "projects": TaskProject.objects.filter(user=request.user).order_by("name"), + "projects": TaskProject.objects.filter(user=request.user).order_by( + "name" + ), "mappings": mappings, "primary_project": mappings[0].project if mappings else None, "tasks": tasks, @@ -1044,7 +1157,9 @@ class TaskGroupDetail(LoginRequiredMixin, View): ) epic = None if epic_name: - epic, _ = TaskEpic.objects.get_or_create(project=project, name=epic_name) + epic, _ = TaskEpic.objects.get_or_create( + project=project, name=epic_name + ) _upsert_group_source( user=request.user, service=channel["service_key"], @@ -1097,7 +1212,11 @@ class TaskGroupDetail(LoginRequiredMixin, View): messages.error(request, "No mapped project found for this chat.") elif not new_name: messages.error(request, "Project name is required.") - elif TaskProject.objects.filter(user=request.user, name=new_name).exclude(id=current.project_id).exists(): + elif ( + TaskProject.objects.filter(user=request.user, name=new_name) + .exclude(id=current.project_id) + .exists() + ): messages.error(request, f"Project '{new_name}' already exists.") else: current.project.name = new_name @@ -1121,7 +1240,9 @@ class TaskDetail(LoginRequiredMixin, View): ) events = task.events.select_related("source_message").order_by("-created_at") for row in events: - service_hint = str(getattr(task, "source_service", "") or "").strip().lower() + service_hint = ( + str(getattr(task, "source_service", "") or "").strip().lower() + ) event_source_message = getattr(row, "source_message", None) row.actor_display = _creator_label_for_message( request.user, @@ -1139,10 +1260,14 @@ class TaskDetail(LoginRequiredMixin, View): getattr(task, "origin_message", None), ) sync_events = task.external_sync_events.order_by("-created_at") - codex_runs = task.codex_runs.select_related("source_message").order_by("-created_at") - permission_requests = CodexPermissionRequest.objects.filter(codex_run__task=task).select_related( - "codex_run", "external_sync_event" - ).order_by("-requested_at") + codex_runs = task.codex_runs.select_related("source_message").order_by( + "-created_at" + ) + permission_requests = ( + CodexPermissionRequest.objects.filter(codex_run__task=task) + .select_related("codex_run", "external_sync_event") + .order_by("-requested_at") + ) return render( request, self.template_name, @@ -1167,7 +1292,9 @@ class TaskSettings(LoginRequiredMixin, View): projects = list(TaskProject.objects.filter(user=request.user).order_by("name")) for row in projects: row.settings_effective = _flags_with_defaults(row.settings) - row.allowed_prefixes_csv = ",".join(row.settings_effective["allowed_prefixes"]) + row.allowed_prefixes_csv = ",".join( + row.settings_effective["allowed_prefixes"] + ) sources = list( ChatTaskSource.objects.filter(user=request.user) .select_related("project", "epic") @@ -1175,17 +1302,27 @@ class TaskSettings(LoginRequiredMixin, View): ) for row in sources: row.settings_effective = _flags_with_defaults(row.settings) - row.allowed_prefixes_csv = ",".join(row.settings_effective["allowed_prefixes"]) + row.allowed_prefixes_csv = ",".join( + row.settings_effective["allowed_prefixes"] + ) provider_map = _provider_row_map(request.user) codex_cfg = provider_map.get("codex_cli") - codex_settings = _codex_settings_with_defaults(dict(getattr(codex_cfg, "settings", {}) or {})) + codex_settings = _codex_settings_with_defaults( + dict(getattr(codex_cfg, "settings", {}) or {}) + ) claude_cfg = provider_map.get("claude_cli") - claude_settings = _claude_settings_with_defaults(dict(getattr(claude_cfg, "settings", {}) or {})) + claude_settings = _claude_settings_with_defaults( + dict(getattr(claude_cfg, "settings", {}) or {}) + ) mock_cfg = provider_map.get("mock") codex_provider = get_provider("codex_cli") claude_provider = get_provider("claude_cli") - codex_healthcheck = codex_provider.healthcheck(codex_settings) if codex_cfg else None - claude_healthcheck = claude_provider.healthcheck(claude_settings) if claude_cfg else None + codex_healthcheck = ( + codex_provider.healthcheck(codex_settings) if codex_cfg else None + ) + claude_healthcheck = ( + claude_provider.healthcheck(claude_settings) if claude_cfg else None + ) codex_queue_counts = { "pending": ExternalSyncEvent.objects.filter( user=request.user, provider="codex_cli", status="pending" @@ -1214,7 +1351,9 @@ class TaskSettings(LoginRequiredMixin, View): user=request.user, provider="claude_cli", status="ok" ).count(), } - codex_recent_runs = CodexRun.objects.filter(user=request.user).order_by("-created_at")[:10] + codex_recent_runs = CodexRun.objects.filter(user=request.user).order_by( + "-created_at" + )[:10] latest_worker_event = ( ExternalSyncEvent.objects.filter( user=request.user, @@ -1227,12 +1366,14 @@ class TaskSettings(LoginRequiredMixin, View): worker_heartbeat_at = getattr(latest_worker_event, "updated_at", None) worker_heartbeat_age = "" if worker_heartbeat_at is not None: - delta_seconds = max(0, int((timezone.now() - worker_heartbeat_at).total_seconds())) + delta_seconds = max( + 0, int((timezone.now() - worker_heartbeat_at).total_seconds()) + ) worker_heartbeat_age = f"{delta_seconds}s ago" external_chat_links = list( - ExternalChatLink.objects.filter(user=request.user).select_related( - "person", "person_identifier" - ).order_by("-updated_at")[:200] + ExternalChatLink.objects.filter(user=request.user) + .select_related("person", "person_identifier") + .order_by("-updated_at")[:200] ) person_identifiers = ( PersonIdentifier.objects.filter(user=request.user) @@ -1252,9 +1393,13 @@ class TaskSettings(LoginRequiredMixin, View): return { "projects": projects, - "epics": TaskEpic.objects.filter(project__user=request.user).select_related("project").order_by("project__name", "name"), + "epics": TaskEpic.objects.filter(project__user=request.user) + .select_related("project") + .order_by("project__name", "name"), "sources": sources, - "patterns": TaskCompletionPattern.objects.filter(user=request.user).order_by("position", "created_at"), + "patterns": TaskCompletionPattern.objects.filter( + user=request.user + ).order_by("position", "created_at"), "provider_configs": list(provider_map.values()), "mock_provider_config": mock_cfg, "codex_provider_config": codex_cfg, @@ -1263,16 +1408,24 @@ class TaskSettings(LoginRequiredMixin, View): "workspace_root": str(codex_settings.get("workspace_root") or ""), "default_profile": str(codex_settings.get("default_profile") or ""), "timeout_seconds": int(codex_settings.get("timeout_seconds") or 60), - "chat_link_mode": str(codex_settings.get("chat_link_mode") or "task-sync"), - "instance_label": str(codex_settings.get("instance_label") or "default"), + "chat_link_mode": str( + codex_settings.get("chat_link_mode") or "task-sync" + ), + "instance_label": str( + codex_settings.get("instance_label") or "default" + ), "approver_service": str(codex_settings.get("approver_service") or ""), - "approver_identifier": str(codex_settings.get("approver_identifier") or ""), + "approver_identifier": str( + codex_settings.get("approver_identifier") or "" + ), "approver_mode": "channel", }, "codex_compact_summary": { "healthcheck_ok": bool(getattr(codex_healthcheck, "ok", False)), "healthcheck_error": str(getattr(codex_healthcheck, "error", "") or ""), - "healthcheck_payload": dict(getattr(codex_healthcheck, "payload", {}) or {}), + "healthcheck_payload": dict( + getattr(codex_healthcheck, "payload", {}) or {} + ), "worker_heartbeat_at": worker_heartbeat_at, "worker_heartbeat_age": worker_heartbeat_age, "queue_counts": codex_queue_counts, @@ -1285,12 +1438,18 @@ class TaskSettings(LoginRequiredMixin, View): "default_profile": str(claude_settings.get("default_profile") or ""), "timeout_seconds": int(claude_settings.get("timeout_seconds") or 60), "approver_service": str(claude_settings.get("approver_service") or ""), - "approver_identifier": str(claude_settings.get("approver_identifier") or ""), + "approver_identifier": str( + claude_settings.get("approver_identifier") or "" + ), }, "claude_compact_summary": { "healthcheck_ok": bool(getattr(claude_healthcheck, "ok", False)), - "healthcheck_error": str(getattr(claude_healthcheck, "error", "") or ""), - "healthcheck_payload": dict(getattr(claude_healthcheck, "payload", {}) or {}), + "healthcheck_error": str( + getattr(claude_healthcheck, "error", "") or "" + ), + "healthcheck_payload": dict( + getattr(claude_healthcheck, "payload", {}) or {} + ), "queue_counts": claude_queue_counts, }, "person_identifiers": person_identifiers, @@ -1298,7 +1457,9 @@ class TaskSettings(LoginRequiredMixin, View): "external_link_scoped": external_link_scoped, "external_link_scope_label": external_link_scope_label, "external_chat_links": external_chat_links, - "sync_events": ExternalSyncEvent.objects.filter(user=request.user).order_by("-updated_at")[:100], + "sync_events": ExternalSyncEvent.objects.filter(user=request.user).order_by( + "-updated_at" + )[:100], "prefill_service": prefill_service, "prefill_identifier": prefill_identifier, } @@ -1320,7 +1481,9 @@ class TaskSettings(LoginRequiredMixin, View): return _settings_redirect(request) if action == "epic_create": - project = get_object_or_404(TaskProject, id=request.POST.get("project_id"), user=request.user) + project = get_object_or_404( + TaskProject, id=request.POST.get("project_id"), user=request.user + ) epic = TaskEpic.objects.create( project=project, name=str(request.POST.get("name") or "Epic").strip() or "Epic", @@ -1331,15 +1494,21 @@ class TaskSettings(LoginRequiredMixin, View): return _settings_redirect(request) if action == "source_create": - project = get_object_or_404(TaskProject, id=request.POST.get("project_id"), user=request.user) + project = get_object_or_404( + TaskProject, id=request.POST.get("project_id"), user=request.user + ) epic = None epic_id = str(request.POST.get("epic_id") or "").strip() if epic_id: - epic = get_object_or_404(TaskEpic, id=epic_id, project__user=request.user) + epic = get_object_or_404( + TaskEpic, id=epic_id, project__user=request.user + ) ChatTaskSource.objects.create( user=request.user, service=str(request.POST.get("service") or "web").strip(), - channel_identifier=str(request.POST.get("channel_identifier") or "").strip(), + channel_identifier=str( + request.POST.get("channel_identifier") or "" + ).strip(), project=project, epic=epic, enabled=bool(request.POST.get("enabled") or "1"), @@ -1349,8 +1518,12 @@ class TaskSettings(LoginRequiredMixin, View): if action == "quick_setup": service = str(request.POST.get("service") or "web").strip().lower() or "web" - channel_identifier = str(request.POST.get("channel_identifier") or "").strip() - project_name = str(request.POST.get("project_name") or "").strip() or "General" + channel_identifier = str( + request.POST.get("channel_identifier") or "" + ).strip() + project_name = ( + str(request.POST.get("project_name") or "").strip() or "General" + ) epic_name = str(request.POST.get("epic_name") or "").strip() project, _ = TaskProject.objects.get_or_create( user=request.user, @@ -1362,7 +1535,9 @@ class TaskSettings(LoginRequiredMixin, View): project.save(update_fields=["settings", "updated_at"]) epic = None if epic_name: - epic, _ = TaskEpic.objects.get_or_create(project=project, name=epic_name) + epic, _ = TaskEpic.objects.get_or_create( + project=project, name=epic_name + ) if channel_identifier: source, created = ChatTaskSource.objects.get_or_create( user=request.user, @@ -1380,17 +1555,29 @@ class TaskSettings(LoginRequiredMixin, View): source.epic = epic source.enabled = True source.settings = _flags_from_post(request, prefix="source_") - source.save(update_fields=["project", "epic", "enabled", "settings", "updated_at"]) + source.save( + update_fields=[ + "project", + "epic", + "enabled", + "settings", + "updated_at", + ] + ) return _settings_redirect(request) if action == "project_flags_update": - project = get_object_or_404(TaskProject, id=request.POST.get("project_id"), user=request.user) + project = get_object_or_404( + TaskProject, id=request.POST.get("project_id"), user=request.user + ) project.settings = _flags_from_post(request) project.save(update_fields=["settings", "updated_at"]) return _settings_redirect(request) if action == "source_flags_update": - source = get_object_or_404(ChatTaskSource, id=request.POST.get("source_id"), user=request.user) + source = get_object_or_404( + ChatTaskSource, id=request.POST.get("source_id"), user=request.user + ) source.settings = _flags_from_post(request, prefix="source_") source.save(update_fields=["settings", "updated_at"]) return _settings_redirect(request) @@ -1410,7 +1597,12 @@ class TaskSettings(LoginRequiredMixin, View): TaskCompletionPattern.objects.get_or_create( user=request.user, phrase=phrase, - defaults={"enabled": True, "position": TaskCompletionPattern.objects.filter(user=request.user).count()}, + defaults={ + "enabled": True, + "position": TaskCompletionPattern.objects.filter( + user=request.user + ).count(), + }, ) return _settings_redirect(request) @@ -1452,14 +1644,27 @@ class TaskSettings(LoginRequiredMixin, View): return _settings_redirect(request) if action == "external_chat_link_upsert": - provider = str(request.POST.get("provider") or "codex_cli").strip().lower() or "codex_cli" + provider = ( + str(request.POST.get("provider") or "codex_cli").strip().lower() + or "codex_cli" + ) external_chat_id = str(request.POST.get("external_chat_id") or "").strip() - person_identifier_id = str(request.POST.get("person_identifier_id") or "").strip() - prefill_service = str( - request.POST.get("prefill_service") or request.GET.get("service") or "" - ).strip().lower() + person_identifier_id = str( + request.POST.get("person_identifier_id") or "" + ).strip() + prefill_service = ( + str( + request.POST.get("prefill_service") + or request.GET.get("service") + or "" + ) + .strip() + .lower() + ) prefill_identifier = str( - request.POST.get("prefill_identifier") or request.GET.get("identifier") or "" + request.POST.get("prefill_identifier") + or request.GET.get("identifier") + or "" ).strip() if not external_chat_id: messages.error(request, "External chat ID is required.") @@ -1512,7 +1717,9 @@ class TaskSettings(LoginRequiredMixin, View): return _settings_redirect(request) if action == "sync_retry": - event = get_object_or_404(ExternalSyncEvent, id=request.POST.get("event_id"), user=request.user) + event = get_object_or_404( + ExternalSyncEvent, id=request.POST.get("event_id"), user=request.user + ) provider = get_provider(event.provider) if bool(getattr(provider, "run_in_worker", False)): event.status = "pending" @@ -1555,7 +1762,7 @@ class TaskCodexSubmit(LoginRequiredMixin, View): if cfg is None: messages.error( request, - f"{provider_label} provider is disabled. Enable it in Task Settings first.", + f"{provider_label} provider is disabled. Enable it in Task Automation first.", ) return redirect(next_url) run = _enqueue_codex_task_submission( @@ -1578,8 +1785,12 @@ class CodexSettingsPage(LoginRequiredMixin, View): template_name = "pages/codex-settings.html" def _context(self, request): - cfg = TaskProviderConfig.objects.filter(user=request.user, provider="codex_cli").first() - settings_payload = _codex_settings_with_defaults(dict(getattr(cfg, "settings", {}) or {})) + cfg = TaskProviderConfig.objects.filter( + user=request.user, provider="codex_cli" + ).first() + settings_payload = _codex_settings_with_defaults( + dict(getattr(cfg, "settings", {}) or {}) + ) provider = get_provider("codex_cli") health = provider.healthcheck(settings_payload) if cfg else None @@ -1589,7 +1800,11 @@ class CodexSettingsPage(LoginRequiredMixin, View): project_filter = str(request.GET.get("project") or "").strip() date_from = str(request.GET.get("date_from") or "").strip() - runs = CodexRun.objects.filter(user=request.user).select_related("task", "project", "epic").order_by("-created_at") + runs = ( + CodexRun.objects.filter(user=request.user) + .select_related("task", "project", "epic") + .order_by("-created_at") + ) if status_filter: runs = runs.filter(status=status_filter) if service_filter: @@ -1647,7 +1862,9 @@ class CodexApprovalAction(LoginRequiredMixin, View): request_id = str(request.POST.get("request_id") or "").strip() decision = str(request.POST.get("decision") or "").strip().lower() row = get_object_or_404( - CodexPermissionRequest.objects.select_related("codex_run", "external_sync_event"), + CodexPermissionRequest.objects.select_related( + "codex_run", "external_sync_event" + ), id=request_id, user=request.user, ) @@ -1683,14 +1900,18 @@ class CodexApprovalAction(LoginRequiredMixin, View): provider_payload = dict(resume_provider_payload) provider_payload["codex_run_id"] = str(run.id) event_action = resume_action - resume_idempotency_key = str(resume_payload.get("idempotency_key") or "").strip() + resume_idempotency_key = str( + resume_payload.get("idempotency_key") or "" + ).strip() resume_event_key = ( resume_idempotency_key if resume_idempotency_key else f"codex_approval:{row.approval_key}:approved" ) else: - provider_payload = dict(run.request_payload.get("provider_payload") or {}) + provider_payload = dict( + run.request_payload.get("provider_payload") or {} + ) provider_payload.update( { "mode": "approval_response", @@ -1709,18 +1930,30 @@ class CodexApprovalAction(LoginRequiredMixin, View): "task_event": run.derived_task_event, "provider": "codex_cli", "status": "pending", - "payload": {"action": event_action, "provider_payload": provider_payload}, + "payload": { + "action": event_action, + "provider_payload": provider_payload, + }, "error": "", }, ) - messages.success(request, f"Approved {row.approval_key}. Resume event queued.") + messages.success( + request, f"Approved {row.approval_key}. Resume event queued." + ) return redirect("codex_settings") row.status = "denied" row.resolved_at = now row.resolved_by_identifier = "settings_ui" row.resolution_note = "denied via settings ui" - row.save(update_fields=["status", "resolved_at", "resolved_by_identifier", "resolution_note"]) + row.save( + update_fields=[ + "status", + "resolved_at", + "resolved_by_identifier", + "resolution_note", + ] + ) run = row.codex_run run.status = "denied" run.error = "approval_denied" @@ -1770,7 +2003,9 @@ class AnswerSuggestionSend(LoginRequiredMixin, View): text = str(getattr(event.candidate_answer, "answer_text", "") or "").strip() msg = event.message if not text: - return JsonResponse({"ok": False, "error": "empty_candidate_answer"}, status=400) + return JsonResponse( + {"ok": False, "error": "empty_candidate_answer"}, status=400 + ) ok = async_to_sync(send_message_raw)( msg.source_service or "web", msg.source_chat_id or "", diff --git a/core/views/whatsapp.py b/core/views/whatsapp.py index e23192d..08f9f77 100644 --- a/core/views/whatsapp.py +++ b/core/views/whatsapp.py @@ -4,7 +4,6 @@ from urllib.parse import urlencode from django.shortcuts import render from django.urls import reverse from django.views import View -from mixins.views import ObjectList, ObjectRead from core.clients import transport from core.models import PersonIdentifier, PlatformChatLink @@ -13,6 +12,7 @@ from core.presence import latest_state_for_people from core.util import logs from core.views.compose import _compose_urls, _service_icon_class from core.views.manage.permissions import SuperUserRequiredMixin +from mixins.views import ObjectList, ObjectRead log = logs.get_logger("whatsapp_view") @@ -293,7 +293,9 @@ class WhatsAppChatsList(WhatsAppContactsList): contact_index[key] = {"name": name, "jid": jid} history_anchors = state.get("history_anchors") or {} - for key, anchor in (history_anchors.items() if isinstance(history_anchors, dict) else []): + for key, anchor in ( + history_anchors.items() if isinstance(history_anchors, dict) else [] + ): identifier = str(key or "").strip() if not identifier: continue @@ -333,7 +335,11 @@ class WhatsAppChatsList(WhatsAppContactsList): f"{reverse('compose_contact_match')}?" f"{urlencode({'service': 'whatsapp', 'identifier': identifier})}" ), - "last_ts": int((anchor or {}).get("ts") or (anchor or {}).get("updated_at") or 0), + "last_ts": int( + (anchor or {}).get("ts") + or (anchor or {}).get("updated_at") + or 0 + ), } ) diff --git a/core/views/workspace.py b/core/views/workspace.py index fec6737..a3590c7 100644 --- a/core/views/workspace.py +++ b/core/views/workspace.py @@ -972,7 +972,9 @@ def _history_points(conversation, field_name, density="medium"): for row in rows: source_ts = int(row.get("source_event_ts") or 0) if source_ts > 0: - x_value = datetime.fromtimestamp(source_ts / 1000, tz=timezone.utc).isoformat() + x_value = datetime.fromtimestamp( + source_ts / 1000, tz=timezone.utc + ).isoformat() else: x_value = row["computed_at"].isoformat() raw_points.append( @@ -995,11 +997,9 @@ def _metric_supports_history(metric_slug, metric_spec): def _all_graph_payload(conversation, density="medium"): graphs = [] for spec in INSIGHT_GRAPH_SPECS: - raw_count = ( - conversation.metric_snapshots.exclude( - **{f"{spec['field']}__isnull": True} - ).count() - ) + raw_count = conversation.metric_snapshots.exclude( + **{f"{spec['field']}__isnull": True} + ).count() points = _history_points(conversation, spec["field"], density=density) graphs.append( { @@ -3557,13 +3557,13 @@ class AIWorkspaceContactsWidget(LoginRequiredMixin, View): { "person": person, "message_count": message_qs.count(), - "last_text": (last_message.text or "")[:120] - if last_message - else "", + "last_text": ( + (last_message.text or "")[:120] if last_message else "" + ), "last_ts": last_message.ts if last_message else None, - "last_ts_label": _format_unix_ms(last_message.ts) - if last_message - else "", + "last_ts_label": ( + _format_unix_ms(last_message.ts) if last_message else "" + ), } ) rows.sort(key=lambda row: row["last_ts"] or 0, reverse=True) @@ -4355,7 +4355,7 @@ class AIWorkspaceQueueDraft(LoginRequiredMixin, View): return _render_send_status( request, False, - "No enabled manipulation found for this recipient. Queue entry not created.", + "No enabled manipulation found for this recipient. Approvals queue entry not created.", "warning", ) @@ -5099,7 +5099,7 @@ class AIWorkspaceEngageShare(LoginRequiredMixin, View): request, person, plan, - notice_message="No enabled manipulation found for this recipient. Queue entry not created.", + notice_message="No enabled manipulation found for this recipient. Approvals queue entry not created.", notice_level="warning", engage_preview=engage_preview, engage_form=engage_form, diff --git a/core/workspace/sampling.py b/core/workspace/sampling.py index 303d0bc..30036ea 100644 --- a/core/workspace/sampling.py +++ b/core/workspace/sampling.py @@ -74,7 +74,9 @@ def downsample_points(points: list[dict], density: str = "medium") -> list[dict] if bucket_ms <= 0: passthrough.append( { - "x": datetime.fromtimestamp(ts_ms / 1000, tz=timezone.utc).isoformat(), + "x": datetime.fromtimestamp( + ts_ms / 1000, tz=timezone.utc + ).isoformat(), "y": row.get("y"), "ts_ms": ts_ms, } @@ -116,12 +118,18 @@ def downsample_points(points: list[dict], density: str = "medium") -> list[dict] if not output: return [] # Preserve first/last and reduce to density cap if still too large. - cap = int(DENSITY_POINT_CAPS.get(str(density or "").strip().lower(), DENSITY_POINT_CAPS["medium"])) + cap = int( + DENSITY_POINT_CAPS.get( + str(density or "").strip().lower(), DENSITY_POINT_CAPS["medium"] + ) + ) compact = _compress_to_target(output, cap) return compact -def compact_snapshot_rows(snapshot_rows: list[dict], now_ts_ms: int, cutoff_ts_ms: int) -> set[int]: +def compact_snapshot_rows( + snapshot_rows: list[dict], now_ts_ms: int, cutoff_ts_ms: int +) -> set[int]: """ Returns IDs to keep using the same age-bucket policy as graph sampling. Old rows below cutoff are dropped; remaining rows keep one representative diff --git a/docker/watch_and_restart.py b/docker/watch_and_restart.py index b4296f8..10d7447 100644 --- a/docker/watch_and_restart.py +++ b/docker/watch_and_restart.py @@ -23,6 +23,7 @@ management command), you can "touch" any file under the watched path: The watcher ignores `__pycache__`, `.pyc` files and `.git` paths. """ + import os import subprocess import time diff --git a/docker/watch_simple.py b/docker/watch_simple.py index 2ed9322..0d2f2cb 100644 --- a/docker/watch_simple.py +++ b/docker/watch_simple.py @@ -14,6 +14,7 @@ Example: Touching a file under the watched path will trigger a restart of the target container; e.g. `touch /code/core/__restart__` will cause the watcher to act. """ + import os import subprocess import sys diff --git a/manage.py b/manage.py index 1a64b14..923e331 100755 --- a/manage.py +++ b/manage.py @@ -1,5 +1,6 @@ #!/usr/bin/env python """Django's command-line utility for administrative tasks.""" + import os import sys diff --git a/scripts/quadlet/render_units.py b/scripts/quadlet/render_units.py index ffb0604..9fa2fe8 100755 --- a/scripts/quadlet/render_units.py +++ b/scripts/quadlet/render_units.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 from __future__ import annotations -from pathlib import Path import argparse import os import shutil +from pathlib import Path def parse_env(path: Path) -> dict[str, str]: @@ -39,14 +39,18 @@ def write_unit(path: Path, content: str) -> None: def main() -> int: parser = argparse.ArgumentParser() parser.add_argument("--stack-env", default="stack.env") - parser.add_argument("--output-dir", default=str(Path.home() / ".config/containers/systemd")) + parser.add_argument( + "--output-dir", default=str(Path.home() / ".config/containers/systemd") + ) args = parser.parse_args() repo_root = Path(__file__).resolve().parents[2] stack_env_path = abs_from(repo_root, args.stack_env, "stack.env") env = parse_env(stack_env_path) stack_id = str(env.get("GIA_STACK_ID") or env.get("STACK_ID") or "").strip() - stack_id = "".join(ch if (ch.isalnum() or ch in "._-") else "-" for ch in stack_id).strip("-") + stack_id = "".join( + ch if (ch.isalnum() or ch in "._-") else "-" for ch in stack_id + ).strip("-") def with_stack(base: str) -> str: return f"{base}_{stack_id}" if stack_id else base @@ -65,12 +69,16 @@ def main() -> int: else: stack_port_offset = 0 app_port = int(env.get("APP_PORT") or (5006 + stack_port_offset)) - signal_public_port = int(env.get("SIGNAL_PUBLIC_PORT") or (8080 + stack_port_offset)) + signal_public_port = int( + env.get("SIGNAL_PUBLIC_PORT") or (8080 + stack_port_offset) + ) repo_dir = abs_from(repo_root, env.get("REPO_DIR", "."), ".") host_uid = int(os.getuid()) host_gid = int(os.getgid()) - app_db_file = abs_from(repo_root, env.get("APP_DATABASE_FILE", "./db.sqlite3"), "./db.sqlite3") + app_db_file = abs_from( + repo_root, env.get("APP_DATABASE_FILE", "./db.sqlite3"), "./db.sqlite3" + ) app_db_basename = app_db_file.name sqlite_data_dir = abs_from( repo_root, @@ -80,18 +88,36 @@ def main() -> int: host_db_file = (sqlite_data_dir / app_db_basename).resolve() app_db_path_in_container = f"/conf/{app_db_basename}" - redis_data_dir = abs_from(repo_root, env.get("QUADLET_REDIS_DATA_DIR", "./.podman/gia_redis_data"), "./.podman/gia_redis_data") - whatsapp_data_dir = abs_from(repo_root, env.get("QUADLET_WHATSAPP_DATA_DIR", "./.podman/gia_whatsapp_data"), "./.podman/gia_whatsapp_data") + redis_data_dir = abs_from( + repo_root, + env.get("QUADLET_REDIS_DATA_DIR", "./.podman/gia_redis_data"), + "./.podman/gia_redis_data", + ) + whatsapp_data_dir = abs_from( + repo_root, + env.get("QUADLET_WHATSAPP_DATA_DIR", "./.podman/gia_whatsapp_data"), + "./.podman/gia_whatsapp_data", + ) vrun_dir = Path("/code/vrun") / stack_id if stack_id else Path("/code/vrun") signal_cli_dir = (repo_dir / "signal-cli-config").resolve() uwsgi_ini = (repo_dir / "docker" / "uwsgi.ini").resolve() redis_conf = (repo_dir / "docker" / "redis.conf").resolve() - for p in (redis_data_dir, whatsapp_data_dir, sqlite_data_dir, vrun_dir, signal_cli_dir): + for p in ( + redis_data_dir, + whatsapp_data_dir, + sqlite_data_dir, + vrun_dir, + signal_cli_dir, + ): p.mkdir(parents=True, exist_ok=True) sqlite_data_dir.chmod(0o777) - if app_db_file.resolve() != host_db_file and app_db_file.exists() and not host_db_file.exists(): + if ( + app_db_file.resolve() != host_db_file + and app_db_file.exists() + and not host_db_file.exists() + ): shutil.copy2(app_db_file, host_db_file) host_db_file.touch(exist_ok=True) host_db_file.chmod(0o666) @@ -170,7 +196,16 @@ RestartSec=2 WantedBy={target_ref} """ - def gia_container(name: str, container_name: str, command: str, include_uwsgi: bool, include_whatsapp: bool, after: str, requires: str, one_shot: bool = False) -> str: + def gia_container( + name: str, + container_name: str, + command: str, + include_uwsgi: bool, + include_whatsapp: bool, + after: str, + requires: str, + one_shot: bool = False, + ) -> str: lines = [ "[Unit]", f"Description={name}", @@ -193,21 +228,27 @@ WantedBy={target_ref} if include_uwsgi: lines.append(f"Volume={uwsgi_ini}:/conf/uwsgi.ini") if include_whatsapp: - lines.append(f"Volume={whatsapp_data_dir}:{env.get('WHATSAPP_DB_DIR', '/var/tmp/whatsapp')}") + lines.append( + f"Volume={whatsapp_data_dir}:{env.get('WHATSAPP_DB_DIR', '/var/tmp/whatsapp')}" + ) lines.append(f"Exec={command}") lines.extend(["", "[Service]"]) if one_shot: - lines.extend([ - "Type=oneshot", - "RemainAfterExit=yes", - "TimeoutStartSec=0", - f"ExecStartPre=/bin/sh -c 'for i in $(seq 1 60); do [ -S {vrun_dir}/gia-redis.sock ] && exit 0; sleep 1; done; exit 1'", - ]) + lines.extend( + [ + "Type=oneshot", + "RemainAfterExit=yes", + "TimeoutStartSec=0", + f"ExecStartPre=/bin/sh -c 'for i in $(seq 1 60); do [ -S {vrun_dir}/gia-redis.sock ] && exit 0; sleep 1; done; exit 1'", + ] + ) else: - lines.extend([ - "Restart=always", - "RestartSec=2", - ]) + lines.extend( + [ + "Restart=always", + "RestartSec=2", + ] + ) lines.extend(["", "[Install]", "WantedBy=gia.target"]) lines[-1] = f"WantedBy={target_ref}" return "\n".join(lines) @@ -237,7 +278,7 @@ WantedBy={target_ref} app_unit = gia_container( "GIA App", with_stack("gia"), - "sh -c 'if [ \\\"$OPERATION\\\" = \\\"uwsgi\\\" ] ; then . /venv/bin/activate && uwsgi --ini /conf/uwsgi.ini ; else . /venv/bin/activate && exec python manage.py runserver 0.0.0.0:8000; fi'", + 'sh -c \'if [ \\"$OPERATION\\" = \\"uwsgi\\" ] ; then . /venv/bin/activate && uwsgi --ini /conf/uwsgi.ini ; else . /venv/bin/activate && exec python manage.py runserver 0.0.0.0:8000; fi\'', include_uwsgi=True, include_whatsapp=True, after=f"{unit_prefix}-collectstatic.service {unit_prefix}-redis.service {unit_prefix}-signal.service",