diff --git a/core/templates/pages/tasks-detail.html b/core/templates/pages/tasks-detail.html index d0e0000..9b5297f 100644 --- a/core/templates/pages/tasks-detail.html +++ b/core/templates/pages/tasks-detail.html @@ -3,6 +3,12 @@

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

Events

@@ -10,7 +16,17 @@ WhenTypeActorPayload {% for row in events %} - {{ row.created_at }}{{ row.event_type }}{{ row.actor_identifier }}{{ row.payload }} + + {{ 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 %} + + {{ row.payload }} + {% empty %} No events. {% endfor %} diff --git a/core/templates/pages/tasks-epic.html b/core/templates/pages/tasks-epic.html index 95369d9..bd21457 100644 --- a/core/templates/pages/tasks-epic.html +++ b/core/templates/pages/tasks-epic.html @@ -4,9 +4,15 @@

Epic: {{ epic.name }}

Back to project
-
    +
      {% for row in tasks %} -
    • #{{ row.reference_code }} {{ row.title }}
      • +
    • + #{{ row.reference_code }} {{ row.title }} + · by {{ row.creator_label|default:"Unknown" }} + {% if row.creator_identifier %} + {{ row.creator_identifier }} + {% endif %} +
      • {% empty %}
    • No tasks.
      • {% endfor %} diff --git a/core/templates/pages/tasks-group.html b/core/templates/pages/tasks-group.html index dbcc02c..5364f12 100644 --- a/core/templates/pages/tasks-group.html +++ b/core/templates/pages/tasks-group.html @@ -85,18 +85,24 @@

      Derived Tasks

      - + {% for row in tasks %} + {% empty %} - + {% endfor %}
      RefTitleProjectStatus
      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.
      No tasks yet.
      diff --git a/core/templates/pages/tasks-hub.html b/core/templates/pages/tasks-hub.html index 8b4c359..8192caa 100644 --- a/core/templates/pages/tasks-hub.html +++ b/core/templates/pages/tasks-hub.html @@ -134,18 +134,24 @@

      Recent Derived Tasks

      - + {% for row in tasks %} + {% empty %} - + {% endfor %}
      RefTitleProjectStatus
      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 derived tasks yet.
      No derived tasks yet.
      diff --git a/core/templates/pages/tasks-project.html b/core/templates/pages/tasks-project.html index 31a7c6e..6fee24f 100644 --- a/core/templates/pages/tasks-project.html +++ b/core/templates/pages/tasks-project.html @@ -55,17 +55,23 @@

      Tasks

      - + {% for row in tasks %} + {% empty %} - + {% endfor %}
      RefTitleEpic
      RefTitleCreated ByEpic
      #{{ row.reference_code }} {{ row.title }} + {{ row.creator_label|default:"Unknown" }} + {% if row.creator_identifier %} +
      {{ row.creator_identifier }}
      + {% endif %} +       		{% if row.epic %}{{ row.epic.name }}{% else %}-{% endif %} Open
      No tasks.
      No tasks.
      diff --git a/core/templates/pages/tasks-settings.html b/core/templates/pages/tasks-settings.html index fb93373..ed1a5a1 100644 --- a/core/templates/pages/tasks-settings.html +++ b/core/templates/pages/tasks-settings.html @@ -362,7 +362,13 @@

      External Chat Links

      -

      Map a GIA contact identifier to one Codex conversation/session so task-sync updates are routed to the correct Codex thread.

      +

      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 %}
      @@ -390,7 +396,7 @@
      - +
      -

      Choose which contact/group in GIA this Codex chat mapping belongs to.

      +

      Which GIA contact/group this link belongs to.

      - +
      -

      Use the Codex conversation/session ID (the stable ID Codex worker should target for task updates).

      +

      Stable Codex conversation/session ID.

      @@ -485,6 +491,14 @@ .tasks-settings-page .tasks-link-scope-note { margin-bottom: 0.75rem; } + .tasks-settings-page .tasks-external-help { + margin-bottom: 0.55rem; + } + .tasks-settings-page .tasks-external-help > summary { + cursor: pointer; + color: #4a4a4a; + margin-bottom: 0.2rem; + } .tasks-settings-page .tasks-external-link-columns .field { margin-bottom: 0.5rem; } diff --git a/core/templates/partials/compose-panel.html b/core/templates/partials/compose-panel.html index 4cdfebd..463f4c7 100644 --- a/core/templates/partials/compose-panel.html +++ b/core/templates/partials/compose-panel.html @@ -343,6 +343,8 @@ + + @@ -398,7 +400,7 @@ data-engage-preview-url="{{ compose_engage_preview_url }}" data-engage-send-url="{{ compose_engage_send_url }}"> {% for msg in serialized_messages %} -
      +
      {% if msg.gap_fragments %} {% with gap=msg.gap_fragments.0 %}

      dict: "image_urls": image_urls, "hide_text": hide_text, "author": author, + "sender_uuid": sender_uuid_value, "outgoing": _is_outgoing(msg), "source_service": source_service, "source_label": source_label, diff --git a/core/views/tasks.py b/core/views/tasks.py index f05ade9..82e7e12 100644 --- a/core/views/tasks.py +++ b/core/views/tasks.py @@ -174,6 +174,53 @@ def _service_label(service: str) -> str: return labels.get(key, key.title() if key else "Unknown") +def _creator_label_for_message(user, service: str, message) -> str: + msg = message + if msg is None: + return "Unknown" + author_raw = str(getattr(msg, "custom_author", "") or "").strip() + author_key = author_raw.upper() + sender_identifier = str(getattr(msg, "sender_uuid", "") or "").strip() + + if author_key == "USER": + return "You" + if author_key == "BOT": + return "System Bot" + + if sender_identifier: + variants = _person_identifier_scope_variants(service, sender_identifier) + person_identifier = ( + PersonIdentifier.objects.filter( + user=user, + service=str(service or "").strip().lower(), + identifier__in=variants or [sender_identifier], + ) + .select_related("person") + .first() + ) + if person_identifier is not None: + person_name = str(getattr(person_identifier.person, "name", "") or "").strip() + if person_name: + return person_name + return sender_identifier + + if author_raw: + if author_key == "OTHER": + return "Other Participant" + return author_raw + return "Unknown" + + +def _apply_task_creator_labels(user, task_rows): + rows = list(task_rows or []) + for row in rows: + origin = getattr(row, "origin_message", None) + service_key = str(getattr(row, "source_service", "") or "").strip().lower() + row.creator_label = _creator_label_for_message(user, service_key, origin) + row.creator_identifier = str(getattr(origin, "sender_uuid", "") or "").strip() + return rows + + def _provider_row_map(user): return { str(row.provider or "").strip().lower(): row @@ -410,9 +457,10 @@ class TasksHub(LoginRequiredMixin, View): ) tasks = ( DerivedTask.objects.filter(user=request.user) - .select_related("project", "epic") + .select_related("project", "epic", "origin_message") .order_by("-created_at")[:200] ) + tasks = _apply_task_creator_labels(request.user, tasks) selected_project = None if scope["selected_project_id"]: selected_project = TaskProject.objects.filter( @@ -547,9 +595,10 @@ class TaskProjectDetail(LoginRequiredMixin, View): def _context(self, request, project): tasks = ( DerivedTask.objects.filter(user=request.user, project=project) - .select_related("epic") + .select_related("epic", "origin_message") .order_by("-created_at") ) + tasks = _apply_task_creator_labels(request.user, tasks) epics = ( TaskEpic.objects.filter(project=project) .annotate(task_count=Count("derived_tasks")) @@ -613,9 +662,10 @@ class TaskEpicDetail(LoginRequiredMixin, View): epic = get_object_or_404(TaskEpic, id=epic_id, project__user=request.user) tasks = ( DerivedTask.objects.filter(user=request.user, epic=epic) - .select_related("project") + .select_related("project", "origin_message") .order_by("-created_at") ) + tasks = _apply_task_creator_labels(request.user, tasks) return render(request, self.template_name, {"epic": epic, "tasks": tasks}) @@ -639,9 +689,10 @@ class TaskGroupDetail(LoginRequiredMixin, View): source_service__in=service_keys, source_channel__in=variants, ) - .select_related("project", "epic") + .select_related("project", "epic", "origin_message") .order_by("-created_at") ) + tasks = _apply_task_creator_labels(request.user, tasks) return render( request, self.template_name, @@ -717,11 +768,28 @@ class TaskDetail(LoginRequiredMixin, View): def get(self, request, task_id): task = get_object_or_404( - DerivedTask.objects.select_related("project", "epic"), + DerivedTask.objects.select_related("project", "epic", "origin_message"), id=task_id, user=request.user, ) 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() + event_source_message = getattr(row, "source_message", None) + row.actor_display = _creator_label_for_message( + request.user, + service_hint, + event_source_message, + ) + if row.actor_display == "Unknown": + raw_actor = str(getattr(row, "actor_identifier", "") or "").strip() + if raw_actor: + row.actor_display = raw_actor + task.creator_label = _creator_label_for_message( + request.user, + str(getattr(task, "source_service", "") or "").strip().lower(), + getattr(task, "origin_message", None), + ) sync_events = task.external_sync_events.order_by("-created_at") return render( request,