From 62c85164f990767b79d0ba6bff3fdd0a80bbeb3d Mon Sep 17 00:00:00 2001 From: xarmian Date: Tue, 7 Apr 2026 21:54:04 +0000 Subject: [PATCH] fix: count implements links as children for progress tracking Progress bars, child item lists, and parent enrichment all only counted 'parent' link types. Items connected via 'implements' links (e.g. tasks implementing a plan) were invisible to the progress system, showing 0/0 even when all implementing items were done. Backend: define childLinkTypes ('parent' + 'implements') and update all 8 SQL queries (GetItemProgress, GetAllItemProgress, GetChildItems, PopulateHasChildren, GetParentMap, GetParentForItem, and both terminal-status helpers) to use IN ('parent','implements'). Frontend: remove the standalone "Derived Closure" banner that duplicated relationship info. Fold closure summary into the matching relationship group as an inline annotation. Add implements-link dedup so children shown in ChildItems aren't repeated in Relationships. --- internal/store/items.go | 54 +++++---- .../[collection]/[slug]/+page.svelte | 112 ++++-------------- 2 files changed, 59 insertions(+), 107 deletions(-) diff --git a/internal/store/items.go b/internal/store/items.go index 06471315..fd378c7e 100644 --- a/internal/store/items.go +++ b/internal/store/items.go @@ -12,6 +12,20 @@ import ( "github.com/xarmian/pad/internal/models" ) +// childLinkTypes lists the link types that establish a parent→child relationship +// for progress tracking. Both 'parent' and 'implements' links count as children. +var childLinkTypes = []string{"parent", "implements"} + +// childLinkTypeSQL returns a SQL IN clause fragment like "'parent','implements'" +// for filtering item_links by child relationship types. +func childLinkTypeSQL() string { + quoted := make([]string, len(childLinkTypes)) + for i, t := range childLinkTypes { + quoted[i] = "'" + t + "'" + } + return strings.Join(quoted, ",") +} + // ItemSearchResult holds FTS search results for items. type ItemSearchResult struct { Item models.Item `json:"item"` @@ -1064,8 +1078,8 @@ func (s *Store) GetParentForItem(itemID string) (*models.ItemLink, error) { JOIN items t ON t.id = l.target_id JOIN collections sc ON sc.id = s.collection_id JOIN collections tc ON tc.id = t.collection_id - WHERE l.source_id = ? AND l.link_type = 'parent' - `, sStatusExpr, tStatusExpr)), itemID) + WHERE l.source_id = ? AND l.link_type IN (%s) + `, sStatusExpr, tStatusExpr, childLinkTypeSQL())), itemID) if err != nil { return nil, fmt.Errorf("get parent for item: %w", err) } @@ -1111,10 +1125,10 @@ func (s *Store) GetParentForItem(itemID string) (*models.ItemLink, error) { // GetParentMap returns a map of item ID -> parent item ID for all parent links // in a workspace. Used for efficient batch lookups (e.g., dashboard, list enrichment). func (s *Store) GetParentMap(workspaceID string) (map[string]string, error) { - rows, err := s.db.Query(s.q(` + rows, err := s.db.Query(s.q(fmt.Sprintf(` SELECT source_id, target_id FROM item_links - WHERE workspace_id = ? AND link_type = 'parent' - `), workspaceID) + WHERE workspace_id = ? AND link_type IN (%s) + `, childLinkTypeSQL())), workspaceID) if err != nil { return nil, fmt.Errorf("get parent map: %w", err) } @@ -1144,9 +1158,9 @@ func (s *Store) GetItemProgress(parentItemID string) (total int, done int, err e SELECT COUNT(*), COUNT(CASE WHEN LOWER(%s) IN (%s) THEN 1 END) FROM items i - JOIN item_links il ON il.source_id = i.id AND il.link_type = 'parent' AND il.target_id = ? + JOIN item_links il ON il.source_id = i.id AND il.link_type IN (%s) AND il.target_id = ? WHERE i.deleted_at IS NULL - `, statusExpr, termPlaceholders)), args...).Scan(&total, &done) + `, statusExpr, termPlaceholders, childLinkTypeSQL())), args...).Scan(&total, &done) if err != nil { return 0, 0, fmt.Errorf("get item progress: %w", err) } @@ -1158,13 +1172,13 @@ func (s *Store) GetItemProgress(parentItemID string) (total int, done int, err e // It queries the actual child items' collection schemas rather than hardcoding 'tasks'. func (s *Store) getChildTerminalPlaceholders(parentItemID string) (string, []any) { // Find distinct collection IDs of child items - rows, err := s.db.Query(s.q(` + rows, err := s.db.Query(s.q(fmt.Sprintf(` SELECT DISTINCT c.schema FROM items i JOIN collections c ON c.id = i.collection_id - JOIN item_links il ON il.source_id = i.id AND il.link_type = 'parent' AND il.target_id = ? + JOIN item_links il ON il.source_id = i.id AND il.link_type IN (%s) AND il.target_id = ? WHERE i.deleted_at IS NULL AND c.deleted_at IS NULL - `), parentItemID) + `, childLinkTypeSQL())), parentItemID) if err != nil { return models.DefaultTerminalStatusPlaceholders() } @@ -1207,17 +1221,17 @@ func (s *Store) getChildTerminalPlaceholders(parentItemID string) (string, []any // a single parent, it gathers terminal statuses across all parent→child links in a // workspace/collection pair. func (s *Store) getCollectionChildTerminalPlaceholders(workspaceID, collectionSlug string) (string, []any) { - rows, err := s.db.Query(s.q(` + rows, err := s.db.Query(s.q(fmt.Sprintf(` SELECT DISTINCT c.schema FROM items t JOIN collections c ON c.id = t.collection_id - JOIN item_links il ON il.source_id = t.id AND il.link_type = 'parent' + JOIN item_links il ON il.source_id = t.id AND il.link_type IN (%s) JOIN items p ON p.id = il.target_id AND p.deleted_at IS NULL JOIN collections pc ON pc.id = p.collection_id AND pc.slug = ? WHERE p.workspace_id = ? AND t.deleted_at IS NULL AND c.deleted_at IS NULL - `), collectionSlug, workspaceID) + `, childLinkTypeSQL())), collectionSlug, workspaceID) if err != nil { return models.DefaultTerminalStatusPlaceholders() } @@ -1272,14 +1286,14 @@ func (s *Store) GetAllItemProgress(workspaceID, collectionSlug string) ([]ItemPr COUNT(CASE WHEN LOWER(%s) IN (%s) THEN 1 END) FROM items p JOIN collections pc ON pc.id = p.collection_id - LEFT JOIN item_links il ON il.link_type = 'parent' AND il.target_id = p.id + LEFT JOIN item_links il ON il.link_type IN (%s) AND il.target_id = p.id LEFT JOIN items t ON t.id = il.source_id AND t.deleted_at IS NULL WHERE p.workspace_id = ? AND pc.slug = ? AND p.deleted_at IS NULL GROUP BY p.id - `, tStatusExpr, termPlaceholders)), args...) + `, tStatusExpr, termPlaceholders, childLinkTypeSQL())), args...) if err != nil { return nil, fmt.Errorf("get all item progress: %w", err) } @@ -1302,7 +1316,7 @@ func (s *Store) GetAllItemProgress(workspaceID, collectionSlug string) ([]ItemPr // GetChildItems returns all non-deleted child items linked to the given parent // via item_links. Returns children from any collection. func (s *Store) GetChildItems(parentItemID string) ([]models.Item, error) { - rows, err := s.db.Query(s.q(` + rows, err := s.db.Query(s.q(fmt.Sprintf(` SELECT i.id, i.workspace_id, i.collection_id, i.title, i.slug, i.content, i.fields, i.tags, i.pinned, i.sort_order, i.parent_id, i.assigned_user_id, i.agent_role_id, i.role_sort_order, i.created_by, i.last_modified_by, i.source, @@ -1312,12 +1326,12 @@ func (s *Store) GetChildItems(parentItemID string) ([]models.Item, error) { COALESCE(ar.name, ''), COALESCE(ar.slug, ''), COALESCE(ar.icon, '') FROM items i JOIN collections c ON c.id = i.collection_id - JOIN item_links il ON il.source_id = i.id AND il.link_type = 'parent' AND il.target_id = ? + JOIN item_links il ON il.source_id = i.id AND il.link_type IN (%s) AND il.target_id = ? LEFT JOIN users au ON au.id = i.assigned_user_id LEFT JOIN agent_roles ar ON ar.id = i.agent_role_id WHERE i.deleted_at IS NULL ORDER BY i.sort_order ASC, i.created_at ASC - `), parentItemID) + `, childLinkTypeSQL())), parentItemID) if err != nil { return nil, fmt.Errorf("get child items: %w", err) } @@ -1351,8 +1365,8 @@ func (s *Store) PopulateHasChildren(items []models.Item) { query := fmt.Sprintf(` SELECT DISTINCT il.target_id FROM item_links il JOIN items child ON child.id = il.source_id AND child.deleted_at IS NULL - WHERE il.link_type = 'parent' AND il.target_id IN (%s) - `, strings.Join(placeholders, ",")) + WHERE il.link_type IN (%s) AND il.target_id IN (%s) + `, childLinkTypeSQL(), strings.Join(placeholders, ",")) rows, err := s.db.Query(s.q(query), args...) if err != nil { diff --git a/web/src/routes/[workspace]/[collection]/[slug]/+page.svelte b/web/src/routes/[workspace]/[collection]/[slug]/+page.svelte index 22ef1b15..ece63a0e 100644 --- a/web/src/routes/[workspace]/[collection]/[slug]/+page.svelte +++ b/web/src/routes/[workspace]/[collection]/[slug]/+page.svelte @@ -15,7 +15,7 @@ import { goto } from '$app/navigation'; import { relativeTime, wikiLinksToMarkdown, markdownToWikiLinks, cleanBrokenLinks } from '$lib/utils/markdown'; import { toastStore } from '$lib/stores/toast.svelte'; - import type { Item, Collection, CollectionSettings, QuickAction, ItemLink, ItemRelationRef, AgentRole } from '$lib/types'; + import type { Item, Collection, CollectionSettings, QuickAction, ItemLink, AgentRole } from '$lib/types'; import { parseFields, parseSchema, parseSettings, formatItemRef, getTerminalOptions } from '$lib/types'; import QuickActionsMenu from '$lib/components/common/QuickActionsMenu.svelte'; @@ -31,6 +31,7 @@ label: string; tone: 'default' | 'blocks' | 'wiki' | 'lineage'; entries: RelationshipEntry[]; + closureSummary?: string; }; let wsSlug = $derived(page.params.workspace ?? ''); @@ -79,7 +80,6 @@ let childItemIds = $state>(new Set()); let hasChildren = $state(false); let relationshipGroups = $derived(item ? buildRelationshipGroups(item, itemLinks, childItemIds) : []); - let closureEntries = $derived(item?.derived_closure?.related_items?.map((related) => relationRefEntry(related)) ?? []); let codeContext = $derived(item?.code_context ?? null); $effect(() => { if (wsSlug && collSlug && itemSlug) { @@ -348,15 +348,6 @@ return `/${wsSlug}/${collectionSlug}/${refOrSlug}`; } - function relationRefEntry(related: ItemRelationRef): RelationshipEntry { - return { - key: related.id, - label: relationLabel(related.ref, related.title, related.id), - href: relationHref(related.collection_slug, related.ref ?? related.slug), - status: related.status - }; - } - function linkEntry(link: ItemLink, useSource: boolean): RelationshipEntry { const ref = useSource ? link.source_ref : link.target_ref; const title = useSource ? link.source_title : link.target_title; @@ -424,15 +415,31 @@ case 'supersedes': addEntry(isSource ? 'supersedes' : 'superseded_by', linkEntry(link, !isSource)); break; - case 'implements': + case 'implements': { + // If this item is the target (implemented by) and the source is already shown in ChildItems, skip it + if (!isSource && excludeChildIds.has(link.source_id)) break; addEntry(isSource ? 'implements' : 'implemented_by', linkEntry(link, !isSource)); break; + } default: addEntry('related', linkEntry(link, !isSource)); break; } } + // Annotate the matching relationship group with closure summary + if (currentItem.derived_closure) { + const closureGroupKey: Record = { + superseded_by: 'superseded_by', + implemented_by: 'implemented_by', + split_into: 'split_into' + }; + const key = closureGroupKey[currentItem.derived_closure.kind]; + if (key && grouped.has(key)) { + grouped.get(key)!.closureSummary = currentItem.derived_closure.summary; + } + } + return order .map((key) => grouped.get(key)) .filter((group): group is RelationshipGroup => Boolean(group && group.entries.length > 0)); @@ -779,33 +786,6 @@ - - {#if item.derived_closure} -
-
-

Derived Closure

- {formatFieldDisplay(item.derived_closure.kind)} -
-

{item.derived_closure.summary}

- {#if closureEntries.length > 0} -
- {#each closureEntries as related (related.key)} -
- {#if related.href} - {related.label} - {:else} - {related.label} - {/if} - {#if related.status} - {formatFieldDisplay(related.status)} - {/if} -
- {/each} -
- {/if} -
- {/if} - {#if relationshipGroups.length > 0}

Relationships

@@ -813,6 +793,9 @@ {#each relationshipGroups as group (group.label)}

{group.label}

+ {#if group.closureSummary} +

✓ {group.closureSummary}

+ {/if}
{#each group.entries as entry (entry.key)}
@@ -1235,56 +1218,11 @@ color: var(--text-muted); } - /* Derived closure */ - .closure-notice { - margin-top: var(--space-6); - padding: var(--space-4); - background: color-mix(in srgb, var(--accent-green) 10%, var(--bg-secondary)); - border: 1px solid color-mix(in srgb, var(--accent-green) 35%, var(--border)); - border-radius: var(--radius); - } - .closure-notice-header { - display: flex; - align-items: center; - justify-content: space-between; - gap: var(--space-3); - margin-bottom: var(--space-2); - flex-wrap: wrap; - } - .closure-kind { - font-size: 0.75em; - font-weight: 600; - text-transform: uppercase; - letter-spacing: 0.04em; + .closure-inline-summary { + margin: 0 0 var(--space-2) 0; + font-size: 0.8em; color: var(--accent-green); - } - .closure-summary { - margin: 0; - color: var(--text-primary); - } - .closure-related-list { - display: flex; - flex-wrap: wrap; - gap: var(--space-2); - margin-top: var(--space-3); - } - .closure-related-item { - display: inline-flex; - align-items: center; - gap: var(--space-2); - padding: var(--space-2) var(--space-3); - background: var(--bg-primary); - border: 1px solid var(--border); - border-radius: var(--radius); - } - .closure-related-link { font-weight: 500; - color: var(--text-primary); - text-decoration: none; - } - .closure-related-link:hover { - color: var(--accent-blue); - text-decoration: underline; } /* Relationships */