@taskforcehq/taskforce 0.3.305 → 0.3.307

package/dist/core/AiProfileService.js

@@ -1,4 +1,16 @@
 import { isAiProfileSurfaceType } from '../shared/aiProfileSurfaceType.js';
+import { isAiProfileSeatScope } from '../shared/aiProfileSeatScope.js';
+import { normalizeSyncSameOriginAssetUrl } from '../sync/syncFieldSemantics.js';
+function normalizeNullableIsoString(value) {
+    if (typeof value !== 'string')
+        return null;
+    const normalized = value.trim();
+    return normalized.length > 0 ? normalized : null;
+}
+function normalizeNullableProfileReference(value) {
+    const normalized = String(value || '').trim();
+    return normalized.length > 0 ? normalized : null;
+}
 function normalizeOptionalProfileField(value) {
     if (value === undefined)
         return undefined;
@@ -7,22 +19,278 @@ function normalizeOptionalProfileField(value) {
     const normalized = String(value).trim();
     return normalized.length > 0 ? normalized : undefined;
 }
+function normalizeAiProfileAvatarUrl(value) {
+    return normalizeSyncSameOriginAssetUrl(value);
+}
+function normalizeAiProfileAvatarRevision(value) {
+    if (value === undefined || value === null || value === '')
+        return 0;
+    const normalized = typeof value === 'number' ? value : Number(value);
+    if (!Number.isFinite(normalized))
+        return 0;
+    return Math.max(0, Math.floor(normalized));
+}
+function hasAiProfileAvatarState(avatarUrl, avatarSourceUrl) {
+    return Boolean(avatarUrl || avatarSourceUrl);
+}
+function compareIsoStrings(left, right) {
+    const normalizedLeft = normalizeNullableIsoString(left);
+    const normalizedRight = normalizeNullableIsoString(right);
+    if (!normalizedLeft && !normalizedRight)
+        return 0;
+    if (!normalizedLeft)
+        return -1;
+    if (!normalizedRight)
+        return 1;
+    return normalizedLeft.localeCompare(normalizedRight);
+}
+function deriveRosterStateUpdatedAt(value, fallbacks) {
+    const explicitValue = normalizeNullableIsoString(value);
+    const archivedAt = normalizeNullableIsoString(fallbacks.archivedAt);
+    const createdAt = normalizeNullableIsoString(fallbacks.createdAt);
+    if (archivedAt) {
+        return explicitValue && compareIsoStrings(explicitValue, archivedAt) >= 0
+            ? explicitValue
+            : archivedAt;
+    }
+    // Legacy active snapshots may carry fresh metadata updatedAt values without
+    // carrying an intentional roster lifecycle event. Treat creation as the
+    // active lifecycle baseline so metadata-only sync cannot resurrect archives.
+    return explicitValue ?? createdAt;
+}
 function normalizeAiProfileSurfaceTypeInput(deps, value) {
     if (value === undefined)
         return undefined;
     if (value === null)
         return null;
     if (typeof value !== 'string') {
-        throw deps.createRuleError('AI profile surfaceType must be one of chat_app, ide, coding_tool, agent, or other', 400, 'AI_PROFILE_SURFACE_TYPE_INVALID');
+        throw deps.createRuleError('AI profile surfaceType must be one of chat_app, ide, cli, coding_tool, or agent', 400, 'AI_PROFILE_SURFACE_TYPE_INVALID');
     }
     const normalized = value.trim();
     if (!normalized)
         return null;
+    if (normalized === 'other')
+        return 'agent';
     if (!isAiProfileSurfaceType(normalized)) {
-        throw deps.createRuleError('AI profile surfaceType must be one of chat_app, ide, coding_tool, agent, or other', 400, 'AI_PROFILE_SURFACE_TYPE_INVALID');
+        throw deps.createRuleError('AI profile surfaceType must be one of chat_app, ide, cli, coding_tool, or agent', 400, 'AI_PROFILE_SURFACE_TYPE_INVALID');
     }
     return normalized;
 }
+function readAiProfileProviderMetadataJson(value) {
+    if (typeof value !== 'string' || value.trim().length === 0)
+        return null;
+    try {
+        const parsed = JSON.parse(value);
+        return parsed && typeof parsed === 'object' && !Array.isArray(parsed)
+            ? parsed
+            : null;
+    }
+    catch {
+        return null;
+    }
+}
+function hasManualSurfaceTypeOverride(profile) {
+    const taskforceMetadata = profile?.providerMetadata?.taskforce;
+    return Boolean(taskforceMetadata
+        && typeof taskforceMetadata === 'object'
+        && !Array.isArray(taskforceMetadata)
+        && taskforceMetadata.surfaceTypeManuallySet === true);
+}
+function markManualSurfaceTypeOverride(row) {
+    const metadata = readAiProfileProviderMetadataJson(row.provider_metadata_json) ?? {};
+    const taskforceMetadata = metadata.taskforce && typeof metadata.taskforce === 'object' && !Array.isArray(metadata.taskforce)
+        ? metadata.taskforce
+        : {};
+    return JSON.stringify({
+        ...metadata,
+        taskforce: {
+            ...taskforceMetadata,
+            surfaceTypeManuallySet: true
+        }
+    });
+}
+function clearManualSurfaceTypeOverride(row) {
+    const metadata = readAiProfileProviderMetadataJson(row.provider_metadata_json);
+    if (!metadata)
+        return null;
+    const taskforceMetadata = metadata.taskforce && typeof metadata.taskforce === 'object' && !Array.isArray(metadata.taskforce)
+        ? { ...metadata.taskforce }
+        : null;
+    if (!taskforceMetadata || taskforceMetadata.surfaceTypeManuallySet !== true) {
+        return JSON.stringify(metadata);
+    }
+    delete taskforceMetadata.surfaceTypeManuallySet;
+    const nextMetadata = { ...metadata };
+    if (Object.keys(taskforceMetadata).length > 0) {
+        nextMetadata.taskforce = taskforceMetadata;
+    }
+    else {
+        delete nextMetadata.taskforce;
+    }
+    return Object.keys(nextMetadata).length > 0
+        ? JSON.stringify(nextMetadata)
+        : null;
+}
+function normalizeAiProfileSeatScopeInput(deps, value) {
+    if (value === undefined)
+        return undefined;
+    if (value === null)
+        return null;
+    if (typeof value !== 'string') {
+        throw deps.createRuleError('AI profile seatScope must be cloud_metered or local_unmetered', 400, 'AI_PROFILE_SEAT_SCOPE_INVALID');
+    }
+    const normalized = value.trim();
+    if (!normalized)
+        return null;
+    if (!isAiProfileSeatScope(normalized)) {
+        throw deps.createRuleError('AI profile seatScope must be cloud_metered or local_unmetered', 400, 'AI_PROFILE_SEAT_SCOPE_INVALID');
+    }
+    return normalized;
+}
+function resolveAiProfileSeatScope(deps, inputSeatScope, existing) {
+    const incomingSeatScope = normalizeAiProfileSeatScopeInput(deps, inputSeatScope);
+    const existingSeatScope = existing?.seatScope ?? null;
+    if (incomingSeatScope === undefined) {
+        return {
+            seatScope: existingSeatScope,
+            seatScopeProvided: false,
+        };
+    }
+    if (incomingSeatScope === 'cloud_metered' || existingSeatScope === 'cloud_metered') {
+        return {
+            seatScope: 'cloud_metered',
+            seatScopeProvided: true,
+        };
+    }
+    return {
+        seatScope: incomingSeatScope ?? existingSeatScope,
+        seatScopeProvided: true,
+    };
+}
+function resolveSyncedAiProfileSeatScope(deps, inputSeatScope, existing) {
+    const incomingSeatScope = normalizeAiProfileSeatScopeInput(deps, inputSeatScope);
+    const existingSeatScope = existing?.seatScope ?? null;
+    if (incomingSeatScope === undefined) {
+        return {
+            seatScope: existingSeatScope,
+            seatScopeProvided: false,
+        };
+    }
+    return {
+        seatScope: incomingSeatScope ?? existingSeatScope,
+        seatScopeProvided: true,
+    };
+}
+function resolveTrustedAiProfileSeatScope(deps, trustedSeatScope, existing) {
+    const normalizedTrustedSeatScope = normalizeAiProfileSeatScopeInput(deps, trustedSeatScope);
+    if (normalizedTrustedSeatScope === undefined) {
+        return {
+            seatScope: existing?.seatScope ?? null,
+            seatScopeProvided: false,
+        };
+    }
+    return {
+        seatScope: normalizedTrustedSeatScope,
+        seatScopeProvided: true,
+    };
+}
+function aiProfileMatchesTrustedSeatScope(deps, row, trustedSeatScope) {
+    if (trustedSeatScope === undefined)
+        return true;
+    const profile = deps.aiProfileRowToRecord(row);
+    const profileSeatScope = profile.seatScope ?? null;
+    if (profileSeatScope === null)
+        return true;
+    return profileSeatScope === trustedSeatScope;
+}
+function findFirstAiProfileRowForTrustedSeatScope(deps, rows, trustedSeatScope) {
+    if (trustedSeatScope === undefined)
+        return rows[0];
+    return rows.find((row) => aiProfileMatchesTrustedSeatScope(deps, row, trustedSeatScope));
+}
+function filterAiProfileRowsForTrustedSeatScope(deps, rows, trustedSeatScope) {
+    if (trustedSeatScope === undefined)
+        return rows;
+    return rows.filter((row) => aiProfileMatchesTrustedSeatScope(deps, row, trustedSeatScope));
+}
+function normalizeAiProfileIdentityValue(value) {
+    return String(value || '').trim().toLowerCase();
+}
+function latestAiProfileActivityValue(row) {
+    return normalizeNullableIsoString(row.last_active_at)
+        ?? normalizeNullableIsoString(row.updated_at)
+        ?? normalizeNullableIsoString(row.created_at)
+        ?? '';
+}
+function rankNullableIdentityMatch(existingValue, incomingValue) {
+    const existing = normalizeAiProfileIdentityValue(existingValue);
+    if (incomingValue) {
+        if (existing === incomingValue)
+            return 2;
+        if (!existing)
+            return 1;
+        return 0;
+    }
+    return existing ? 0 : 1;
+}
+function selectAiProfileIdentityMatch(deps, rows, input, trustedSeatScope) {
+    const scopedRows = filterAiProfileRowsForTrustedSeatScope(deps, rows, trustedSeatScope);
+    const incomingProvider = normalizeAiProfileIdentityValue(input.provider) || null;
+    const incomingModel = normalizeAiProfileIdentityValue(input.model) || null;
+    const incomingSurfaceType = input.surfaceTypeProvided
+        ? normalizeAiProfileIdentityValue(input.surfaceType) || null
+        : null;
+    const ranked = scopedRows
+        .map((row) => {
+        const providerRank = rankNullableIdentityMatch(row.provider, incomingProvider);
+        const surfaceRank = input.surfaceTypeProvided
+            ? rankNullableIdentityMatch(row.surface_type, incomingSurfaceType)
+            : 0;
+        const modelRank = incomingModel && normalizeAiProfileIdentityValue(row.model) === incomingModel ? 1 : 0;
+        return {
+            row,
+            providerRank,
+            surfaceRank,
+            modelRank,
+            activity: latestAiProfileActivityValue(row),
+        };
+    })
+        .filter((entry) => Boolean(entry))
+        .sort((left, right) => {
+        if (right.providerRank !== left.providerRank)
+            return right.providerRank - left.providerRank;
+        if (right.surfaceRank !== left.surfaceRank)
+            return right.surfaceRank - left.surfaceRank;
+        if (right.modelRank !== left.modelRank)
+            return right.modelRank - left.modelRank;
+        const activityDelta = right.activity.localeCompare(left.activity);
+        if (activityDelta !== 0)
+            return activityDelta;
+        return String(left.row.id || '').localeCompare(String(right.row.id || ''));
+    });
+    return {
+        row: ranked[0]?.row,
+        matchCount: ranked.length,
+    };
+}
+function requiresCloudSeatReservation(existing, nextSeatScope) {
+    if (nextSeatScope !== 'cloud_metered')
+        return false;
+    if (existing?.archivedAt)
+        return true;
+    return existing?.seatScope !== 'cloud_metered';
+}
+function assertAiProfileSeatAvailable(deps, workspaceId) {
+    const aiProfileUsage = deps.countAiProfileUsage(workspaceId);
+    if (aiProfileUsage.limit !== null && aiProfileUsage.used >= aiProfileUsage.limit) {
+        throw deps.createRuleError('No AI seats are available for this workspace. Remove an existing cloud AI profile or upgrade your plan.', 403, 'AI_PROFILE_LIMIT_REACHED', {
+            workspaceId,
+            limit: aiProfileUsage.limit,
+            used: aiProfileUsage.used,
+            remaining: aiProfileUsage.remaining
+        });
+    }
+}
 function inferAiProfileProviderModelDefaults(name) {
     const normalized = String(name || '').trim().toLowerCase();
     if (!normalized)
@@ -54,6 +322,12 @@ function inferAiProfileMetadataDefaults(name, surfaceType) {
                 role: 'Coding Agent',
                 ...inferredProviderModel
             };
+        case 'cli':
+            return {
+                description: `${name} CLI coding agent connected through MCP.`,
+                role: 'CLI Coding Agent',
+                ...inferredProviderModel
+            };
         case 'chat_app':
             return {
                 description: `${name} conversational AI connected through Taskforce.`,
@@ -66,12 +340,6 @@ function inferAiProfileMetadataDefaults(name, surfaceType) {
                 role: 'Coding Assistant',
                 ...inferredProviderModel
             };
-        case 'other':
-            return {
-                description: `${name} AI profile connected through Taskforce.`,
-                role: 'AI Assistant',
-                ...inferredProviderModel
-            };
         default:
             return {};
     }
@@ -87,7 +355,9 @@ function resolveOptionalProfileField(inputValue, existingValue, fallbackValue) {
 }
 function resolveAiProfileMetadataFields(deps, input, existing) {
     const surfaceTypeInput = normalizeAiProfileSurfaceTypeInput(deps, input.surfaceType);
+    const manuallyOverridden = hasManualSurfaceTypeOverride(existing);
     const effectiveSurfaceType = surfaceTypeInput === undefined
+        || manuallyOverridden
         ? existing?.surfaceType ?? null
         : surfaceTypeInput;
     const inferredDefaults = inferAiProfileMetadataDefaults(input.name, effectiveSurfaceType);
@@ -97,7 +367,7 @@ function resolveAiProfileMetadataFields(deps, input, existing) {
         provider: resolveOptionalProfileField(input.provider, existing?.provider, inferredDefaults.provider) ?? null,
         model: resolveOptionalProfileField(input.model, existing?.model, inferredDefaults.model) ?? null,
         surfaceType: effectiveSurfaceType,
-        surfaceTypeProvided: surfaceTypeInput !== undefined,
+        surfaceTypeProvided: surfaceTypeInput !== undefined && !manuallyOverridden,
     };
 }
 function applyAiProfileMetadataDefaults(record) {
@@ -110,7 +380,167 @@ function applyAiProfileMetadataDefaults(record) {
         model: resolveOptionalProfileField(undefined, record.model, inferredDefaults.model) ?? null,
     };
 }
-function hydrateAiProfileRecord(deps, row) {
+function backfillMissingAiProfileAvatarFromDuplicate(deps, row) {
+    const id = String(row.id || '').trim();
+    const workspaceId = String(row.workspace_id || '').trim();
+    const name = String(row.name || '').trim();
+    const username = String(row.username || '').trim();
+    if (!id || !workspaceId || (!name && !username))
+        return;
+    const currentAvatarUrl = normalizeAiProfileAvatarUrl(row.avatar_url);
+    const currentAvatarSourceUrl = normalizeAiProfileAvatarUrl(row.avatar_source_url);
+    if (hasAiProfileAvatarState(currentAvatarUrl, currentAvatarSourceUrl))
+        return;
+    const currentRevision = normalizeAiProfileAvatarRevision(row.avatar_revision);
+    const donor = deps.db.prepare(`
+        SELECT avatar_url, avatar_source_url, avatar_revision, avatar_updated_at, updated_at
+        FROM ai_profiles
+        WHERE tenant_id = ?
+          AND workspace_id = ?
+          AND id <> ?
+          AND archived_at IS NULL
+          AND (
+                (? <> '' AND LOWER(name) = LOWER(?))
+                OR (? <> '' AND LOWER(username) = LOWER(?))
+          )
+          AND (
+                (avatar_url IS NOT NULL AND TRIM(avatar_url) <> '')
+                OR (avatar_source_url IS NOT NULL AND TRIM(avatar_source_url) <> '')
+          )
+        ORDER BY COALESCE(avatar_revision, 0) DESC,
+                 COALESCE(avatar_updated_at, updated_at) DESC,
+                 id ASC
+        LIMIT 1
+    `).get(deps.tenantId, workspaceId, id, name, name, username, username);
+    if (!donor)
+        return;
+    const donorRevision = normalizeAiProfileAvatarRevision(donor.avatar_revision);
+    if (donorRevision < currentRevision)
+        return;
+    const donorAvatarUrl = normalizeAiProfileAvatarUrl(donor.avatar_url);
+    const donorAvatarSourceUrl = normalizeAiProfileAvatarUrl(donor.avatar_source_url);
+    if (!hasAiProfileAvatarState(donorAvatarUrl, donorAvatarSourceUrl))
+        return;
+    const nextRevision = Math.max(currentRevision, donorRevision, 1);
+    const nextAvatarUpdatedAt = normalizeNullableIsoString(donor.avatar_updated_at)
+        ?? normalizeNullableIsoString(donor.updated_at)
+        ?? new Date().toISOString();
+    deps.db.prepare(`
+        UPDATE ai_profiles
+        SET avatar_url = ?,
+            avatar_source_url = ?,
+            avatar_revision = ?,
+            avatar_updated_at = ?,
+            updated_at = ?
+        WHERE tenant_id = ? AND workspace_id = ? AND id = ?
+    `).run(donorAvatarUrl, donorAvatarSourceUrl, nextRevision, nextAvatarUpdatedAt, nextAvatarUpdatedAt, deps.tenantId, workspaceId, id);
+    row.avatar_url = donorAvatarUrl;
+    row.avatar_source_url = donorAvatarSourceUrl;
+    row.avatar_revision = nextRevision;
+    row.avatar_updated_at = nextAvatarUpdatedAt;
+    row.updated_at = nextAvatarUpdatedAt;
+}
+function backfillMissingAiProfileAvatarFromAssetIndex(deps, row) {
+    const id = String(row.id || '').trim();
+    const workspaceId = String(row.workspace_id || '').trim();
+    if (!id || !workspaceId)
+        return;
+    const currentAvatarUrl = normalizeAiProfileAvatarUrl(row.avatar_url);
+    const currentAvatarSourceUrl = normalizeAiProfileAvatarUrl(row.avatar_source_url);
+    if (hasAiProfileAvatarState(currentAvatarUrl, currentAvatarSourceUrl))
+        return;
+    if (normalizeAiProfileAvatarRevision(row.avatar_revision) > 0)
+        return;
+    if (normalizeNullableIsoString(row.avatar_updated_at))
+        return;
+    const avatarPrefix = `workspaces/${workspaceId}/assets/images/ai-profiles/${id}/avatar/`;
+    try {
+        const latestCropped = deps.db.prepare(`
+            SELECT storage_key, updated_at, created_at
+            FROM workspace_assets
+            WHERE tenant_id = ?
+              AND workspace_id = ?
+              AND deleted_at IS NULL
+              AND storage_key LIKE ?
+              AND (
+                    LOWER(original_filename) LIKE 'cropped-%'
+                    OR LOWER(logical_name) = 'ai profile avatar display'
+                    OR LOWER(storage_key) LIKE '%/display.webp'
+                    OR LOWER(storage_key) LIKE '%/display.gif'
+                    OR LOWER(storage_key) LIKE '%/display.png'
+                    OR LOWER(storage_key) LIKE '%/display.jpg'
+                    OR LOWER(storage_key) LIKE '%/display.jpeg'
+                    OR LOWER(original_filename) = 'avatar.webp'
+                    OR LOWER(original_filename) = 'avatar.png'
+                    OR LOWER(original_filename) = 'avatar.jpg'
+                    OR LOWER(original_filename) = 'avatar.jpeg'
+              )
+            ORDER BY COALESCE(updated_at, created_at) DESC, storage_key DESC
+            LIMIT 1
+        `).get(deps.tenantId, workspaceId, `${avatarPrefix}%`);
+        if (!latestCropped)
+            return;
+        const latestSource = deps.db.prepare(`
+            SELECT storage_key, updated_at, created_at
+            FROM workspace_assets
+            WHERE tenant_id = ?
+              AND workspace_id = ?
+              AND deleted_at IS NULL
+              AND storage_key LIKE ?
+              AND (
+                    LOWER(original_filename) LIKE 'source-%'
+                    OR LOWER(logical_name) = 'ai profile avatar source'
+                    OR LOWER(storage_key) LIKE '%/source.webp'
+                    OR LOWER(storage_key) LIKE '%/source.gif'
+                    OR LOWER(storage_key) LIKE '%/source.png'
+                    OR LOWER(storage_key) LIKE '%/source.jpg'
+                    OR LOWER(storage_key) LIKE '%/source.jpeg'
+              )
+            ORDER BY COALESCE(updated_at, created_at) DESC, storage_key DESC
+            LIMIT 1
+        `).get(deps.tenantId, workspaceId, `${avatarPrefix}%`);
+        const avatarStorageKey = String(latestCropped.storage_key || '').trim();
+        if (!avatarStorageKey)
+            return;
+        const sourceStorageKey = String(latestSource?.storage_key || '').trim();
+        const avatarUrl = `/api/taskforce/context/${encodeURIComponent(avatarStorageKey)}`;
+        const avatarSourceUrl = sourceStorageKey
+            ? `/api/taskforce/context/${encodeURIComponent(sourceStorageKey)}`
+            : null;
+        const repairedAt = normalizeNullableIsoString(latestCropped.updated_at)
+            ?? normalizeNullableIsoString(latestCropped.created_at)
+            ?? new Date().toISOString();
+        deps.db.prepare(`
+            UPDATE ai_profiles
+            SET avatar_url = ?,
+                avatar_source_url = ?,
+                avatar_revision = 1,
+                avatar_updated_at = ?,
+                updated_at = CASE
+                    WHEN updated_at IS NULL OR TRIM(updated_at) = '' OR updated_at < ? THEN ?
+                    ELSE updated_at
+                END
+            WHERE tenant_id = ? AND workspace_id = ? AND id = ?
+              AND (avatar_url IS NULL OR TRIM(avatar_url) = '')
+              AND (avatar_source_url IS NULL OR TRIM(avatar_source_url) = '')
+              AND COALESCE(avatar_revision, 0) = 0
+              AND (avatar_updated_at IS NULL OR TRIM(avatar_updated_at) = '')
+        `).run(avatarUrl, avatarSourceUrl, repairedAt, repairedAt, repairedAt, deps.tenantId, workspaceId, id);
+        row.avatar_url = avatarUrl;
+        row.avatar_source_url = avatarSourceUrl;
+        row.avatar_revision = 1;
+        row.avatar_updated_at = repairedAt;
+        if (!normalizeNullableIsoString(row.updated_at) || String(row.updated_at) < repairedAt) {
+            row.updated_at = repairedAt;
+        }
+    }
+    catch {
+        // Older or mocked stores may not have workspace_assets available.
+    }
+}
+function hydrateAiProfileRecord(deps, row, diagnostics) {
+    backfillMissingAiProfileAvatarFromDuplicate(deps, row);
+    backfillMissingAiProfileAvatarFromAssetIndex(deps, row);
     const record = deps.aiProfileRowToRecord(row);
     const hydrated = applyAiProfileMetadataDefaults(record);
     const metadataChanged = record.description !== hydrated.description
@@ -126,11 +556,15 @@ function hydrateAiProfileRecord(deps, row) {
                 model = ?
             WHERE tenant_id = ? AND id = ?
         `).run(hydrated.description ?? null, hydrated.role ?? null, hydrated.provider ?? null, hydrated.model ?? null, deps.tenantId, record.id);
+        if (diagnostics) {
+            diagnostics.metadataBackfillCount = (diagnostics.metadataBackfillCount || 0) + 1;
+        }
     }
     return hydrated;
 }
-export function listAiProfilesService(deps, workspaceId) {
+export function listAiProfilesService(deps, workspaceId, options) {
     const normalizedWorkspaceId = deps.normalizeWorkspaceId(workspaceId);
+    const includeArchived = options?.includeArchived === true;
     const rows = deps.db.prepare(`
         SELECT
             id,
@@ -140,35 +574,50 @@ export function listAiProfilesService(deps, workspaceId) {
             username,
             icon,
             color,
+            avatar_url,
+            avatar_source_url,
+            avatar_revision,
+            avatar_updated_at,
             description,
             role,
             provider,
             model,
             surface_type,
+            seat_scope,
             provider_metadata_json,
+            archived_at,
+            archived_by,
+            archived_reason,
+            merged_into_profile_id,
+            roster_state_updated_at,
             created_at,
             updated_at,
             last_active_at
         FROM ai_profiles
         WHERE tenant_id = ?
           AND workspace_id = ?
+          AND (? = 1 OR archived_at IS NULL)
         ORDER BY COALESCE(updated_at, created_at) DESC, LOWER(name) ASC
-    `).all(deps.tenantId, normalizedWorkspaceId);
-    return rows.map((row) => hydrateAiProfileRecord(deps, row));
+    `).all(deps.tenantId, normalizedWorkspaceId, includeArchived ? 1 : 0);
+    return rows.map((row) => hydrateAiProfileRecord(deps, row, options?.diagnostics));
 }
 export function getAiProfileByTokenService(deps, input) {
     const normalizedWorkspaceId = deps.normalizeWorkspaceId(input.workspaceId);
     const profileToken = String(input.profileToken || '').trim();
+    const includeArchived = input.includeArchived === true;
+    const trustedSeatScope = normalizeAiProfileSeatScopeInput(deps, input.seatScope);
     if (!profileToken)
         return null;
-    const row = deps.db.prepare(`
+    const rows = deps.db.prepare(`
         SELECT *
         FROM ai_profiles
         WHERE tenant_id = ?
           AND workspace_id = ?
           AND profile_token = ?
-        LIMIT 1
-    `).get(deps.tenantId, normalizedWorkspaceId, profileToken);
+          AND (? = 1 OR archived_at IS NULL)
+        ORDER BY COALESCE(last_active_at, updated_at, created_at) DESC, id ASC
+    `).all(deps.tenantId, normalizedWorkspaceId, profileToken, includeArchived ? 1 : 0);
+    const row = findFirstAiProfileRowForTrustedSeatScope(deps, rows, trustedSeatScope);
     return row ? hydrateAiProfileRecord(deps, row) : null;
 }
 export function upsertAiProfileForSyncService(deps, profile) {
@@ -183,32 +632,184 @@ export function upsertAiProfileForSyncService(deps, profile) {
     const normalizedLastActiveAt = typeof profile.lastActiveAt === 'string' && profile.lastActiveAt.trim().length > 0
         ? profile.lastActiveAt.trim()
         : null;
+    const normalizedArchivedAt = normalizeNullableIsoString(profile.archivedAt);
+    const normalizedArchivedBy = normalizeNullableProfileReference(profile.archivedBy);
+    const normalizedArchivedReason = normalizeOptionalProfileField(profile.archivedReason) ?? null;
+    const normalizedMergedIntoProfileId = normalizeNullableProfileReference(profile.mergedIntoProfileId);
+    const normalizedRosterStateUpdatedAt = deriveRosterStateUpdatedAt(profile.rosterStateUpdatedAt, {
+        archivedAt: normalizedArchivedAt,
+        createdAt: normalizedCreatedAt,
+        updatedAt: normalizedUpdatedAt,
+    });
     const existingRow = deps.db.prepare(`
         SELECT *
         FROM ai_profiles
         WHERE tenant_id = ? AND workspace_id = ? AND id = ?
         LIMIT 1
     `).get(deps.tenantId, normalizedWorkspaceId, profileId);
-    if (existingRow) {
-        const existingUpdatedAt = String(existingRow.updated_at || existingRow.created_at || '').trim();
-        if (existingUpdatedAt && existingUpdatedAt > normalizedUpdatedAt) {
-            return hydrateAiProfileRecord(deps, existingRow);
-        }
-    }
     const existingProfile = existingRow ? deps.aiProfileRowToRecord(existingRow) : null;
+    const incomingAvatarUrlProvided = Object.prototype.hasOwnProperty.call(profile, 'avatarUrl');
+    const incomingAvatarSourceUrlProvided = Object.prototype.hasOwnProperty.call(profile, 'avatarSourceUrl');
+    const incomingAvatarRevisionProvided = Object.prototype.hasOwnProperty.call(profile, 'avatarRevision');
+    const incomingAvatarRevision = normalizeAiProfileAvatarRevision(profile.avatarRevision);
+    const incomingAvatarUpdatedAt = normalizeNullableIsoString(profile.avatarUpdatedAt);
+    const existingCreatedAt = existingRow
+        ? String(existingRow.created_at || existingRow.updated_at || '').trim()
+        : '';
+    const existingUpdatedAt = existingRow
+        ? String(existingRow.updated_at || existingRow.created_at || '').trim()
+        : '';
+    const existingLastActiveAt = existingRow
+        ? normalizeNullableIsoString(existingRow.last_active_at)
+        : null;
+    const existingArchivedAt = existingRow
+        ? normalizeNullableIsoString(existingRow.archived_at)
+        : null;
+    const existingArchivedBy = existingRow
+        ? normalizeNullableProfileReference(existingRow.archived_by)
+        : null;
+    const existingArchivedReason = existingRow
+        ? normalizeOptionalProfileField(existingRow.archived_reason) ?? null
+        : null;
+    const existingMergedIntoProfileId = existingRow
+        ? normalizeNullableProfileReference(existingRow.merged_into_profile_id)
+        : null;
+    const existingRosterStateUpdatedAt = existingRow
+        ? deriveRosterStateUpdatedAt(existingRow.roster_state_updated_at, {
+            archivedAt: existingArchivedAt,
+            createdAt: existingCreatedAt,
+            updatedAt: existingUpdatedAt,
+        })
+        : null;
+    const existingAvatarRevision = normalizeAiProfileAvatarRevision(existingRow?.avatar_revision);
+    const existingAvatarUpdatedAt = normalizeNullableIsoString(existingRow?.avatar_updated_at);
+    const metadataComparison = compareIsoStrings(normalizedUpdatedAt, existingUpdatedAt);
+    const incomingMetadataWins = !existingRow || metadataComparison > 0;
+    const lifecycleComparison = compareIsoStrings(normalizedRosterStateUpdatedAt, existingRosterStateUpdatedAt);
+    const incomingArchived = normalizedArchivedAt !== null;
+    const existingArchived = existingArchivedAt !== null;
+    const incomingLifecycleWins = !existingRow
+        || lifecycleComparison > 0
+        || (lifecycleComparison === 0 && incomingArchived && !existingArchived);
+    const metadataSourceProfile = incomingMetadataWins
+        ? {
+            id: profileId,
+            workspaceId: normalizedWorkspaceId,
+            profileToken: String(profile.profileToken || '').trim(),
+            name: deps.normalizeAiProfileName(profile.name),
+            username: deps.normalizeAiProfileUsername(profile.username, profile.name),
+            icon: deps.normalizeAiProfileIcon(profile.icon),
+            color: deps.normalizeAiProfileColor(profile.color),
+            avatarUrl: incomingAvatarUrlProvided
+                ? normalizeAiProfileAvatarUrl(profile.avatarUrl)
+                : normalizeAiProfileAvatarUrl(existingProfile?.avatarUrl),
+            avatarSourceUrl: incomingAvatarSourceUrlProvided
+                ? normalizeAiProfileAvatarUrl(profile.avatarSourceUrl)
+                : normalizeAiProfileAvatarUrl(existingProfile?.avatarSourceUrl),
+            description: profile.description ?? null,
+            role: profile.role ?? null,
+            provider: profile.provider ?? null,
+            model: profile.model ?? null,
+            surfaceType: profile.surfaceType ?? null,
+            seatScope: profile.seatScope ?? null,
+            providerMetadata: profile.providerMetadata ?? null,
+            archivedAt: normalizedArchivedAt,
+            archivedBy: normalizedArchivedBy,
+            archivedReason: normalizedArchivedReason,
+            mergedIntoProfileId: normalizedMergedIntoProfileId,
+            rosterStateUpdatedAt: normalizedRosterStateUpdatedAt,
+            createdAt: normalizedCreatedAt,
+            updatedAt: normalizedUpdatedAt,
+            lastActiveAt: normalizedLastActiveAt
+        }
+        : existingProfile;
     const resolvedMetadata = resolveAiProfileMetadataFields(deps, {
-        name: profile.name,
-        description: profile.description,
-        role: profile.role,
-        provider: profile.provider,
-        model: profile.model,
-        surfaceType: profile.surfaceType,
+        name: metadataSourceProfile?.name ?? deps.normalizeAiProfileName(profile.name),
+        description: metadataSourceProfile?.description,
+        role: metadataSourceProfile?.role,
+        provider: metadataSourceProfile?.provider,
+        model: metadataSourceProfile?.model,
+        surfaceType: metadataSourceProfile?.surfaceType,
     }, existingProfile);
+    const resolvedSeatScope = incomingMetadataWins
+        ? resolveSyncedAiProfileSeatScope(deps, profile.seatScope, existingProfile)
+        : {
+            seatScope: existingProfile?.seatScope ?? null,
+            seatScopeProvided: existingProfile?.seatScope !== undefined,
+        };
+    const mergedProfileToken = incomingMetadataWins
+        ? String(profile.profileToken || '').trim()
+        : String(existingRow?.profile_token || '').trim();
+    const mergedName = metadataSourceProfile?.name ?? deps.normalizeAiProfileName(profile.name);
+    const mergedUsername = metadataSourceProfile?.username ?? deps.normalizeAiProfileUsername(profile.username, profile.name);
+    const mergedIcon = metadataSourceProfile?.icon ?? deps.normalizeAiProfileIcon(profile.icon);
+    const mergedColor = metadataSourceProfile?.color ?? deps.normalizeAiProfileColor(profile.color);
+    const existingAvatarUrl = normalizeAiProfileAvatarUrl(existingProfile?.avatarUrl);
+    const existingAvatarSourceUrl = normalizeAiProfileAvatarUrl(existingProfile?.avatarSourceUrl);
+    const incomingAvatarUrl = incomingAvatarUrlProvided ? normalizeAiProfileAvatarUrl(profile.avatarUrl) : null;
+    const incomingAvatarSourceUrl = incomingAvatarSourceUrlProvided ? normalizeAiProfileAvatarUrl(profile.avatarSourceUrl) : null;
+    const incomingHasAvatarState = hasAiProfileAvatarState(incomingAvatarUrl, incomingAvatarSourceUrl);
+    const existingHasAvatarState = hasAiProfileAvatarState(existingAvatarUrl, existingAvatarSourceUrl);
+    let mergedAvatarUrl = existingAvatarUrl;
+    let mergedAvatarSourceUrl = existingAvatarSourceUrl;
+    let mergedAvatarRevision = existingAvatarRevision;
+    let mergedAvatarUpdatedAt = existingAvatarUpdatedAt;
+    if (!existingRow) {
+        mergedAvatarUrl = incomingAvatarUrlProvided ? incomingAvatarUrl : null;
+        mergedAvatarSourceUrl = incomingAvatarSourceUrlProvided ? incomingAvatarSourceUrl : null;
+        mergedAvatarRevision = incomingAvatarRevisionProvided ? incomingAvatarRevision : (incomingHasAvatarState ? 1 : 0);
+        mergedAvatarUpdatedAt = incomingAvatarUpdatedAt ?? (incomingHasAvatarState ? normalizedUpdatedAt : null);
+    }
+    else if (incomingAvatarRevisionProvided) {
+        if (incomingAvatarRevision > existingAvatarRevision) {
+            const incomingClearsAvatar = !incomingHasAvatarState && existingHasAvatarState;
+            const clearHasAvatarTimestamp = Boolean(incomingAvatarUpdatedAt);
+            if (!incomingClearsAvatar || clearHasAvatarTimestamp) {
+                mergedAvatarUrl = incomingAvatarUrlProvided ? incomingAvatarUrl : existingAvatarUrl;
+                mergedAvatarSourceUrl = incomingAvatarSourceUrlProvided ? incomingAvatarSourceUrl : existingAvatarSourceUrl;
+                mergedAvatarRevision = incomingAvatarRevision;
+                mergedAvatarUpdatedAt = incomingAvatarUpdatedAt ?? normalizedUpdatedAt;
+            }
+        }
+        else if (incomingAvatarRevision === existingAvatarRevision) {
+            if (!existingHasAvatarState && incomingHasAvatarState) {
+                mergedAvatarUrl = incomingAvatarUrl;
+                mergedAvatarSourceUrl = incomingAvatarSourceUrl;
+                mergedAvatarUpdatedAt = incomingAvatarUpdatedAt ?? existingAvatarUpdatedAt ?? normalizedUpdatedAt;
+            }
+        }
+    }
+    else if (!existingHasAvatarState && incomingHasAvatarState) {
+        mergedAvatarUrl = incomingAvatarUrl;
+        mergedAvatarSourceUrl = incomingAvatarSourceUrl;
+        mergedAvatarRevision = Math.max(existingAvatarRevision, 1);
+        mergedAvatarUpdatedAt = existingAvatarUpdatedAt ?? normalizedUpdatedAt;
+    }
+    const mergedProviderMetadata = incomingMetadataWins
+        ? (profile.providerMetadata && typeof profile.providerMetadata === 'object' && !Array.isArray(profile.providerMetadata)
+            ? JSON.stringify(profile.providerMetadata)
+            : null)
+        : (typeof existingRow?.provider_metadata_json === 'string' ? existingRow.provider_metadata_json : null);
+    const mergedArchivedAt = incomingLifecycleWins ? normalizedArchivedAt : existingArchivedAt;
+    const mergedArchivedBy = incomingLifecycleWins ? normalizedArchivedBy : existingArchivedBy;
+    const mergedArchivedReason = incomingLifecycleWins ? normalizedArchivedReason : existingArchivedReason;
+    const mergedMergedIntoProfileId = incomingLifecycleWins ? normalizedMergedIntoProfileId : existingMergedIntoProfileId;
+    const mergedRosterStateUpdatedAt = incomingLifecycleWins
+        ? normalizedRosterStateUpdatedAt
+        : existingRosterStateUpdatedAt;
+    const mergedCreatedAt = existingCreatedAt || normalizedCreatedAt;
+    const mergedUpdatedAt = incomingMetadataWins ? normalizedUpdatedAt : (existingUpdatedAt || normalizedUpdatedAt);
+    const mergedLastActiveAt = compareIsoStrings(normalizedLastActiveAt, existingLastActiveAt) > 0
+        ? normalizedLastActiveAt
+        : existingLastActiveAt;
     deps.db.prepare(`
         INSERT INTO ai_profiles (
             id, tenant_id, workspace_id, profile_token, name, username, icon, color,
-            description, role, provider, model, surface_type, provider_metadata_json, created_at, updated_at, last_active_at
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+            avatar_url, avatar_source_url, avatar_revision, avatar_updated_at,
+            description, role, provider, model, surface_type, seat_scope, provider_metadata_json,
+            archived_at, archived_by, archived_reason, merged_into_profile_id,
+            roster_state_updated_at, created_at, updated_at, last_active_at
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         ON CONFLICT(id) DO UPDATE SET
             workspace_id = excluded.workspace_id,
             profile_token = excluded.profile_token,
@@ -216,18 +817,26 @@ export function upsertAiProfileForSyncService(deps, profile) {
             username = excluded.username,
             icon = excluded.icon,
             color = excluded.color,
+            avatar_url = excluded.avatar_url,
+            avatar_source_url = excluded.avatar_source_url,
+            avatar_revision = excluded.avatar_revision,
+            avatar_updated_at = excluded.avatar_updated_at,
             description = excluded.description,
             role = excluded.role,
             provider = excluded.provider,
             model = excluded.model,
             surface_type = excluded.surface_type,
+            seat_scope = excluded.seat_scope,
             provider_metadata_json = excluded.provider_metadata_json,
+            archived_at = excluded.archived_at,
+            archived_by = excluded.archived_by,
+            archived_reason = excluded.archived_reason,
+            merged_into_profile_id = excluded.merged_into_profile_id,
+            roster_state_updated_at = excluded.roster_state_updated_at,
             created_at = excluded.created_at,
             updated_at = excluded.updated_at,
             last_active_at = excluded.last_active_at
-    `).run(profileId, deps.tenantId, normalizedWorkspaceId, String(profile.profileToken || '').trim(), deps.normalizeAiProfileName(profile.name), deps.normalizeAiProfileUsername(profile.username, profile.name), deps.normalizeAiProfileIcon(profile.icon), deps.normalizeAiProfileColor(profile.color), resolvedMetadata.description, resolvedMetadata.role, resolvedMetadata.provider, resolvedMetadata.model, resolvedMetadata.surfaceType, profile.providerMetadata && typeof profile.providerMetadata === 'object' && !Array.isArray(profile.providerMetadata)
-        ? JSON.stringify(profile.providerMetadata)
-        : null, normalizedCreatedAt, normalizedUpdatedAt, normalizedLastActiveAt);
+    `).run(profileId, deps.tenantId, normalizedWorkspaceId, mergedProfileToken, mergedName, mergedUsername, mergedIcon, mergedColor, mergedAvatarUrl, mergedAvatarSourceUrl, mergedAvatarRevision, mergedAvatarUpdatedAt, resolvedMetadata.description, resolvedMetadata.role, resolvedMetadata.provider, resolvedMetadata.model, resolvedMetadata.surfaceType, resolvedSeatScope.seatScope, mergedProviderMetadata, mergedArchivedAt, mergedArchivedBy, mergedArchivedReason, mergedMergedIntoProfileId, mergedRosterStateUpdatedAt, mergedCreatedAt, mergedUpdatedAt, mergedLastActiveAt);
     const refreshed = deps.db.prepare(`
         SELECT *
         FROM ai_profiles
@@ -248,15 +857,29 @@ export function mergeAiProfilesService(deps, input) {
     if (keepId === mergeId)
         throw deps.createRuleError('keepId and mergeId must be different profiles', 400, 'MERGE_PROFILES_SAME_ID');
     const keepProfile = deps.db.prepare(`
-        SELECT * FROM ai_profiles WHERE tenant_id = ? AND workspace_id = ? AND id = ? LIMIT 1
+        SELECT * FROM ai_profiles WHERE tenant_id = ? AND workspace_id = ? AND id = ? AND archived_at IS NULL LIMIT 1
     `).get(deps.tenantId, normalizedWorkspaceId, keepId);
     if (!keepProfile)
         throw deps.createRuleError(`Profile ${keepId} not found`, 404, 'MERGE_PROFILES_KEEP_NOT_FOUND');
     const mergeProfile = deps.db.prepare(`
-        SELECT * FROM ai_profiles WHERE tenant_id = ? AND workspace_id = ? AND id = ? LIMIT 1
+        SELECT * FROM ai_profiles WHERE tenant_id = ? AND workspace_id = ? AND id = ? AND archived_at IS NULL LIMIT 1
     `).get(deps.tenantId, normalizedWorkspaceId, mergeId);
     if (!mergeProfile)
         throw deps.createRuleError(`Profile ${mergeId} not found`, 404, 'MERGE_PROFILES_MERGE_NOT_FOUND');
+    const keepRecord = deps.aiProfileRowToRecord(keepProfile);
+    const mergeRecord = deps.aiProfileRowToRecord(mergeProfile);
+    const keepSeatScope = keepRecord.seatScope ?? null;
+    const mergeSeatScope = mergeRecord.seatScope ?? null;
+    if (keepSeatScope && mergeSeatScope && keepSeatScope !== mergeSeatScope) {
+        throw deps.createRuleError('Local and cloud AI profiles are separate registrations and cannot be merged. Retire one from the roster instead.', 409, 'AI_PROFILE_SEAT_SCOPE_MISMATCH', {
+            workspaceId: normalizedWorkspaceId,
+            keepId,
+            mergeId,
+            keepSeatScope,
+            mergeSeatScope,
+        });
+    }
+    const mergedSeatScope = resolveAiProfileSeatScope(deps, mergeRecord.seatScope, keepRecord);
     const mergedAt = new Date().toISOString();
     const doMerge = deps.db.transaction(() => {
         deps.db.prepare(`
@@ -267,13 +890,28 @@ export function mergeAiProfilesService(deps, input) {
             UPDATE tasks SET created_by = ?, updated_at = ?
             WHERE tenant_id = ? AND workspace_id = ? AND created_by = ?
         `).run(keepId, mergedAt, deps.tenantId, normalizedWorkspaceId, mergeId);
+        deps.db.prepare(`
+            UPDATE ai_profiles
+            SET seat_scope = ?,
+                avatar_url = COALESCE(avatar_url, ?),
+                avatar_source_url = COALESCE(avatar_source_url, ?),
+                updated_at = ?
+            WHERE tenant_id = ? AND workspace_id = ? AND id = ?
+        `).run(mergedSeatScope.seatScope, normalizeAiProfileAvatarUrl(mergeRecord.avatarUrl), normalizeAiProfileAvatarUrl(mergeRecord.avatarSourceUrl), mergedAt, deps.tenantId, normalizedWorkspaceId, keepId);
         deps.db.prepare(`
             UPDATE comments SET author = ?
             WHERE tenant_id = ? AND workspace_id = ? AND author = ?
         `).run(keepId, deps.tenantId, normalizedWorkspaceId, mergeId);
         deps.db.prepare(`
-            DELETE FROM ai_profiles WHERE tenant_id = ? AND workspace_id = ? AND id = ?
-        `).run(deps.tenantId, normalizedWorkspaceId, mergeId);
+            UPDATE ai_profiles
+            SET archived_at = ?,
+                archived_by = ?,
+                archived_reason = ?,
+                merged_into_profile_id = ?,
+                roster_state_updated_at = ?,
+                updated_at = ?
+            WHERE tenant_id = ? AND workspace_id = ? AND id = ?
+        `).run(mergedAt, keepId, 'merged_duplicate', keepId, mergedAt, mergedAt, deps.tenantId, normalizedWorkspaceId, mergeId);
     });
     doMerge();
     const refreshed = deps.db.prepare(`
@@ -281,36 +919,369 @@ export function mergeAiProfilesService(deps, input) {
     `).get(deps.tenantId, keepId);
     return hydrateAiProfileRecord(deps, refreshed);
 }
-export function resolveAiProfileService(deps, input) {
+export function updateAiProfileAvatarService(deps, input) {
+    const normalizedWorkspaceId = deps.normalizeWorkspaceId(input.workspaceId);
+    const profileId = String(input.profileId || '').trim();
+    if (!profileId)
+        throw deps.createRuleError('profileId is required', 400, 'AI_PROFILE_ID_REQUIRED');
+    const existing = deps.db.prepare(`
+        SELECT *
+        FROM ai_profiles
+        WHERE tenant_id = ? AND workspace_id = ? AND id = ? AND archived_at IS NULL
+        LIMIT 1
+    `).get(deps.tenantId, normalizedWorkspaceId, profileId);
+    if (!existing) {
+        throw deps.createRuleError(`Profile ${profileId} not found`, 404, 'AI_PROFILE_NOT_FOUND');
+    }
+    const avatarUrl = normalizeAiProfileAvatarUrl(input.avatarUrl);
+    if (typeof input.avatarUrl === 'string' && input.avatarUrl.trim().length > 0 && !avatarUrl) {
+        throw deps.createRuleError('avatarUrl must be a Taskforce context URL', 400, 'AI_PROFILE_AVATAR_URL_INVALID');
+    }
+    const avatarSourceUrl = input.avatarSourceUrl === undefined
+        ? normalizeAiProfileAvatarUrl(existing.avatar_source_url)
+        : normalizeAiProfileAvatarUrl(input.avatarSourceUrl);
+    if (typeof input.avatarSourceUrl === 'string' && input.avatarSourceUrl.trim().length > 0 && !avatarSourceUrl) {
+        throw deps.createRuleError('avatarSourceUrl must be a Taskforce context URL', 400, 'AI_PROFILE_AVATAR_SOURCE_URL_INVALID');
+    }
+    const currentRevision = normalizeAiProfileAvatarRevision(existing.avatar_revision);
+    const nextRevision = currentRevision + 1;
+    const updatedAt = new Date().toISOString();
+    deps.db.prepare(`
+        UPDATE ai_profiles
+        SET avatar_url = ?,
+            avatar_source_url = ?,
+            avatar_revision = ?,
+            avatar_updated_at = ?,
+            updated_at = ?
+        WHERE tenant_id = ? AND workspace_id = ? AND id = ?
+    `).run(avatarUrl, avatarSourceUrl, nextRevision, updatedAt, updatedAt, deps.tenantId, normalizedWorkspaceId, profileId);
+    if (avatarUrl) {
+        deps.db.prepare(`
+            UPDATE ai_profiles
+            SET avatar_url = ?,
+                avatar_source_url = ?,
+                avatar_revision = CASE
+                    WHEN COALESCE(avatar_revision, 0) < ? THEN ?
+                    ELSE COALESCE(avatar_revision, 0)
+                END,
+                avatar_updated_at = ?,
+                updated_at = ?
+            WHERE tenant_id = ?
+              AND workspace_id = ?
+              AND id <> ?
+              AND archived_at IS NULL
+              AND (
+                    LOWER(name) = LOWER(?)
+                    OR LOWER(username) = LOWER(?)
+              )
+              AND (avatar_url IS NULL OR TRIM(avatar_url) = '')
+              AND (avatar_source_url IS NULL OR TRIM(avatar_source_url) = '')
+        `).run(avatarUrl, avatarSourceUrl, nextRevision, nextRevision, updatedAt, updatedAt, deps.tenantId, normalizedWorkspaceId, profileId, String(existing.name || '').trim(), deps.normalizeAiProfileUsername(existing.username, String(existing.name || '').trim()));
+    }
+    const refreshed = deps.db.prepare(`
+        SELECT *
+        FROM ai_profiles
+        WHERE tenant_id = ? AND workspace_id = ? AND id = ?
+        LIMIT 1
+    `).get(deps.tenantId, normalizedWorkspaceId, profileId);
+    if (!refreshed) {
+        throw deps.createRuleError('Failed to update AI profile avatar', 500, 'AI_PROFILE_AVATAR_UPDATE_FAILED');
+    }
+    return hydrateAiProfileRecord(deps, refreshed);
+}
+export function updateAiProfileSurfaceTypeService(deps, input) {
+    const normalizedWorkspaceId = deps.normalizeWorkspaceId(input.workspaceId);
+    const profileId = String(input.profileId || '').trim();
+    if (!profileId)
+        throw deps.createRuleError('profileId is required', 400, 'AI_PROFILE_ID_REQUIRED');
+    const surfaceType = normalizeAiProfileSurfaceTypeInput(deps, input.surfaceType);
+    if (surfaceType === undefined) {
+        throw deps.createRuleError('surfaceType is required', 400, 'AI_PROFILE_SURFACE_TYPE_REQUIRED');
+    }
+    const existing = deps.db.prepare(`
+        SELECT *
+        FROM ai_profiles
+        WHERE tenant_id = ? AND workspace_id = ? AND id = ? AND archived_at IS NULL
+        LIMIT 1
+    `).get(deps.tenantId, normalizedWorkspaceId, profileId);
+    if (!existing) {
+        throw deps.createRuleError(`Profile ${profileId} not found`, 404, 'AI_PROFILE_NOT_FOUND');
+    }
+    const providerMetadataJson = surfaceType === null
+        ? clearManualSurfaceTypeOverride(existing)
+        : markManualSurfaceTypeOverride(existing);
+    const updatedAt = new Date().toISOString();
+    deps.db.prepare(`
+        UPDATE ai_profiles
+        SET surface_type = ?,
+            provider_metadata_json = ?,
+            updated_at = ?
+        WHERE tenant_id = ? AND workspace_id = ? AND id = ?
+    `).run(surfaceType, providerMetadataJson, updatedAt, deps.tenantId, normalizedWorkspaceId, profileId);
+    const refreshed = deps.db.prepare(`
+        SELECT *
+        FROM ai_profiles
+        WHERE tenant_id = ? AND workspace_id = ? AND id = ?
+        LIMIT 1
+    `).get(deps.tenantId, normalizedWorkspaceId, profileId);
+    if (!refreshed) {
+        throw deps.createRuleError('Failed to update AI profile category', 500, 'AI_PROFILE_SURFACE_TYPE_UPDATE_FAILED');
+    }
+    return hydrateAiProfileRecord(deps, refreshed);
+}
+export function archiveAiProfileService(deps, input) {
+    const normalizedWorkspaceId = deps.normalizeWorkspaceId(input.workspaceId);
+    const profileId = String(input.profileId || '').trim();
+    if (!profileId)
+        throw deps.createRuleError('profileId is required', 400, 'ARCHIVE_AI_PROFILE_INVALID_INPUT');
+    const existingRow = deps.db.prepare(`
+        SELECT *
+        FROM ai_profiles
+        WHERE tenant_id = ? AND workspace_id = ? AND id = ? AND archived_at IS NULL
+        LIMIT 1
+    `).get(deps.tenantId, normalizedWorkspaceId, profileId);
+    if (!existingRow) {
+        throw deps.createRuleError(`Profile ${profileId} not found`, 404, 'ARCHIVE_AI_PROFILE_NOT_FOUND');
+    }
+    const openTaskRow = deps.db.prepare(`
+        SELECT COUNT(*) AS c
+        FROM tasks
+        WHERE tenant_id = ?
+          AND workspace_id = ?
+          AND assignee = ?
+          AND COALESCE(is_archived, 0) = 0
+          AND LOWER(COALESCE(status, 'task')) NOT IN ('done', 'cancelled')
+    `).get(deps.tenantId, normalizedWorkspaceId, profileId);
+    const openTaskCount = Math.max(0, Number(openTaskRow?.c || 0));
+    if (openTaskCount > 0) {
+        throw deps.createRuleError('This AI profile still owns open tasks. Reassign or close them before removing it from the roster.', 409, 'AI_PROFILE_HAS_OPEN_TASKS', { workspaceId: normalizedWorkspaceId, profileId, openTaskCount });
+    }
+    const archivedAt = new Date().toISOString();
+    deps.db.prepare(`
+        UPDATE ai_profiles
+        SET archived_at = ?,
+            archived_by = ?,
+            archived_reason = ?,
+            merged_into_profile_id = NULL,
+            roster_state_updated_at = ?,
+            updated_at = ?
+        WHERE tenant_id = ? AND workspace_id = ? AND id = ?
+    `).run(archivedAt, normalizeNullableProfileReference(input.archivedBy), normalizeOptionalProfileField(input.reason) ?? 'manual_archive', archivedAt, archivedAt, deps.tenantId, normalizedWorkspaceId, profileId);
+    const archivedRow = deps.db.prepare(`
+        SELECT *
+        FROM ai_profiles
+        WHERE tenant_id = ? AND workspace_id = ? AND id = ?
+        LIMIT 1
+    `).get(deps.tenantId, normalizedWorkspaceId, profileId);
+    if (!archivedRow) {
+        throw deps.createRuleError('Failed to archive AI profile', 500, 'ARCHIVE_AI_PROFILE_FAILED');
+    }
+    return {
+        profile: hydrateAiProfileRecord(deps, archivedRow),
+        openTaskCount,
+    };
+}
+export function resolveAiProfileService(deps, input, options) {
     const normalizedWorkspaceId = deps.normalizeWorkspaceId(input.workspaceId);
     const name = deps.normalizeAiProfileName(input.name);
     const profileToken = String(input.profileToken || '').trim();
     const now = new Date().toISOString();
+    const trustedSeatScope = normalizeAiProfileSeatScopeInput(deps, options?.trustedSeatScope);
     if (profileToken) {
-        const existingRow = deps.db.prepare(`
+        const existingRows = deps.db.prepare(`
             SELECT *
             FROM ai_profiles
             WHERE tenant_id = ?
               AND workspace_id = ?
               AND profile_token = ?
-            LIMIT 1
-        `).get(deps.tenantId, normalizedWorkspaceId, profileToken);
+              AND archived_at IS NULL
+            ORDER BY COALESCE(last_active_at, updated_at, created_at) DESC, id ASC
+        `).all(deps.tenantId, normalizedWorkspaceId, profileToken);
+        const existingRow = findFirstAiProfileRowForTrustedSeatScope(deps, existingRows, trustedSeatScope);
         if (!existingRow) {
-            throw deps.createRuleError('AI profile token is invalid for this workspace', 404, 'AI_PROFILE_NOT_FOUND');
+            const archivedRows = deps.db.prepare(`
+                SELECT *
+                FROM ai_profiles
+                WHERE tenant_id = ?
+                  AND workspace_id = ?
+                  AND profile_token = ?
+                  AND archived_at IS NOT NULL
+                ORDER BY COALESCE(last_active_at, updated_at, created_at) DESC, id ASC
+            `).all(deps.tenantId, normalizedWorkspaceId, profileToken);
+            const archivedRow = findFirstAiProfileRowForTrustedSeatScope(deps, archivedRows, trustedSeatScope);
+            if (archivedRow) {
+                const existingProfile = deps.aiProfileRowToRecord(archivedRow);
+                const nextName = name;
+                const nextUsername = deps.normalizeAiProfileUsername(undefined, nextName);
+                const nextIcon = input.icon === undefined
+                    ? existingProfile.icon
+                    : deps.normalizeAiProfileIcon(input.icon);
+                const nextColor = input.color === undefined
+                    ? existingProfile.color
+                    : deps.normalizeAiProfileColor(input.color);
+                const nextDescription = normalizeOptionalProfileField(input.description);
+                const nextRole = normalizeOptionalProfileField(input.role);
+                const nextProvider = normalizeOptionalProfileField(input.provider);
+                const nextModel = normalizeOptionalProfileField(input.model);
+                const resolvedMetadata = resolveAiProfileMetadataFields(deps, {
+                    name: nextName,
+                    description: nextDescription,
+                    role: nextRole,
+                    provider: nextProvider,
+                    model: nextModel,
+                    surfaceType: input.surfaceType,
+                }, existingProfile);
+                const resolvedSeatScope = resolveTrustedAiProfileSeatScope(deps, trustedSeatScope, existingProfile);
+                if (requiresCloudSeatReservation(existingProfile, resolvedSeatScope.seatScope)) {
+                    assertAiProfileSeatAvailable(deps, normalizedWorkspaceId);
+                }
+                deps.db.prepare(`
+                    UPDATE ai_profiles
+                    SET name = ?,
+                        username = ?,
+                        icon = ?,
+                        color = ?,
+                        description = COALESCE(?, description),
+                        role = COALESCE(?, role),
+                        provider = COALESCE(?, provider),
+                        model = COALESCE(?, model),
+                        surface_type = CASE
+                            WHEN ? = 1 THEN ?
+                            ELSE surface_type
+                        END,
+                        seat_scope = CASE
+                            WHEN ? = 1 THEN ?
+                            ELSE seat_scope
+                        END,
+                        archived_at = NULL,
+                        archived_by = NULL,
+                        archived_reason = NULL,
+                        merged_into_profile_id = NULL,
+                        roster_state_updated_at = ?,
+                        last_active_at = ?,
+                        updated_at = ?
+                    WHERE tenant_id = ? AND id = ?
+                `).run(nextName, nextUsername, nextIcon, nextColor, resolvedMetadata.description, resolvedMetadata.role, resolvedMetadata.provider, resolvedMetadata.model, resolvedMetadata.surfaceTypeProvided ? 1 : 0, resolvedMetadata.surfaceType, resolvedSeatScope.seatScopeProvided ? 1 : 0, resolvedSeatScope.seatScope, now, now, now, deps.tenantId, String(archivedRow.id || '').trim());
+                const refreshed = deps.db.prepare(`
+                    SELECT *
+                    FROM ai_profiles
+                    WHERE tenant_id = ? AND id = ?
+                    LIMIT 1
+                `).get(deps.tenantId, String(archivedRow.id || '').trim());
+                if (!refreshed) {
+                    throw deps.createRuleError('Failed to refresh AI profile', 500, 'AI_PROFILE_REFRESH_FAILED');
+                }
+                return {
+                    created: false,
+                    profile: hydrateAiProfileRecord(deps, refreshed)
+                };
+            }
+            // Treat token misses as recoverable when the caller also supplied profile
+            // identity metadata; the name/seat-scope resolver below can bind stale
+            // reconnects without minting duplicates.
+        }
+        else {
+            const existingProfile = deps.aiProfileRowToRecord(existingRow);
+            const nextName = name;
+            const nextUsername = deps.normalizeAiProfileUsername(undefined, nextName);
+            const nextIcon = input.icon === undefined
+                ? existingProfile.icon
+                : deps.normalizeAiProfileIcon(input.icon);
+            const nextColor = input.color === undefined
+                ? existingProfile.color
+                : deps.normalizeAiProfileColor(input.color);
+            const nextDescription = normalizeOptionalProfileField(input.description);
+            const nextRole = normalizeOptionalProfileField(input.role);
+            const nextProvider = normalizeOptionalProfileField(input.provider);
+            const nextModel = normalizeOptionalProfileField(input.model);
+            const resolvedMetadata = resolveAiProfileMetadataFields(deps, {
+                name: nextName,
+                description: nextDescription,
+                role: nextRole,
+                provider: nextProvider,
+                model: nextModel,
+                surfaceType: input.surfaceType,
+            }, existingProfile);
+            const resolvedSeatScope = resolveTrustedAiProfileSeatScope(deps, trustedSeatScope, existingProfile);
+            if (requiresCloudSeatReservation(existingProfile, resolvedSeatScope.seatScope)) {
+                assertAiProfileSeatAvailable(deps, normalizedWorkspaceId);
+            }
+            deps.db.prepare(`
+                UPDATE ai_profiles
+                SET name = ?,
+                    username = ?,
+                    icon = ?,
+                    color = ?,
+                    description = COALESCE(?, description),
+                    role = COALESCE(?, role),
+                    provider = COALESCE(?, provider),
+                    model = COALESCE(?, model),
+                    surface_type = CASE
+                        WHEN ? = 1 THEN ?
+                        ELSE surface_type
+                    END,
+                    seat_scope = CASE
+                        WHEN ? = 1 THEN ?
+                        ELSE seat_scope
+                    END,
+                    last_active_at = ?,
+                    updated_at = ?
+                WHERE tenant_id = ? AND id = ?
+            `).run(nextName, nextUsername, nextIcon, nextColor, resolvedMetadata.description, resolvedMetadata.role, resolvedMetadata.provider, resolvedMetadata.model, resolvedMetadata.surfaceTypeProvided ? 1 : 0, resolvedMetadata.surfaceType, resolvedSeatScope.seatScopeProvided ? 1 : 0, resolvedSeatScope.seatScope, now, now, deps.tenantId, String(existingRow.id || '').trim());
+            const refreshed = deps.db.prepare(`
+                SELECT *
+                FROM ai_profiles
+                WHERE tenant_id = ? AND id = ?
+                LIMIT 1
+            `).get(deps.tenantId, String(existingRow.id || '').trim());
+            if (!refreshed) {
+                throw deps.createRuleError('Failed to refresh AI profile', 500, 'AI_PROFILE_REFRESH_FAILED');
+            }
+            return {
+                created: false,
+                profile: hydrateAiProfileRecord(deps, refreshed)
+            };
         }
-        const existingProfile = deps.aiProfileRowToRecord(existingRow);
+    }
+    const identityDescription = normalizeOptionalProfileField(input.description);
+    const identityRole = normalizeOptionalProfileField(input.role);
+    const inferredIdentity = inferAiProfileProviderModelDefaults(name);
+    const identityProvider = normalizeOptionalProfileField(input.provider)
+        ?? normalizeOptionalProfileField(inferredIdentity.provider);
+    const identityModel = normalizeOptionalProfileField(input.model)
+        ?? normalizeOptionalProfileField(inferredIdentity.model);
+    const identityMetadata = resolveAiProfileMetadataFields(deps, {
+        name,
+        description: identityDescription,
+        role: identityRole,
+        provider: identityProvider,
+        model: identityModel,
+        surfaceType: input.surfaceType,
+    }, null);
+    const exactMatches = deps.db.prepare(`
+        SELECT *
+        FROM ai_profiles
+        WHERE tenant_id = ?
+          AND workspace_id = ?
+          AND archived_at IS NULL
+          AND (
+                LOWER(name) = LOWER(?)
+                OR LOWER(username) = LOWER(?)
+          )
+        ORDER BY COALESCE(last_active_at, updated_at, created_at) DESC, id ASC
+    `).all(deps.tenantId, normalizedWorkspaceId, name, deps.normalizeAiProfileUsername(undefined, name));
+    const exactMatch = selectAiProfileIdentityMatch(deps, exactMatches, identityMetadata, trustedSeatScope);
+    if (exactMatch.row) {
+        const canonicalId = String(exactMatch.row.id || '').trim();
         const nextName = name;
         const nextUsername = deps.normalizeAiProfileUsername(undefined, nextName);
-        const nextIcon = input.icon === undefined
-            ? existingProfile.icon
-            : deps.normalizeAiProfileIcon(input.icon);
-        const nextColor = input.color === undefined
-            ? existingProfile.color
-            : deps.normalizeAiProfileColor(input.color);
+        const nextIcon = deps.normalizeAiProfileIcon(input.icon);
+        const nextColor = deps.normalizeAiProfileColor(input.color);
         const nextDescription = normalizeOptionalProfileField(input.description);
         const nextRole = normalizeOptionalProfileField(input.role);
         const nextProvider = normalizeOptionalProfileField(input.provider);
         const nextModel = normalizeOptionalProfileField(input.model);
+        const existingProfile = deps.aiProfileRowToRecord(exactMatch.row);
         const resolvedMetadata = resolveAiProfileMetadataFields(deps, {
             name: nextName,
             description: nextDescription,
@@ -319,6 +1290,10 @@ export function resolveAiProfileService(deps, input) {
             model: nextModel,
             surfaceType: input.surfaceType,
         }, existingProfile);
+        const resolvedSeatScope = resolveTrustedAiProfileSeatScope(deps, trustedSeatScope, existingProfile);
+        if (requiresCloudSeatReservation(existingProfile, resolvedSeatScope.seatScope)) {
+            assertAiProfileSeatAvailable(deps, normalizedWorkspaceId);
+        }
         deps.db.prepare(`
             UPDATE ai_profiles
             SET name = ?,
@@ -329,41 +1304,53 @@ export function resolveAiProfileService(deps, input) {
                 role = COALESCE(?, role),
                 provider = COALESCE(?, provider),
                 model = COALESCE(?, model),
+                last_active_at = ?,
+                updated_at = ?,
                 surface_type = CASE
                     WHEN ? = 1 THEN ?
                     ELSE surface_type
                 END,
-                last_active_at = ?,
-                updated_at = ?
+                seat_scope = CASE
+                    WHEN ? = 1 THEN ?
+                    ELSE seat_scope
+                END
             WHERE tenant_id = ? AND id = ?
-        `).run(nextName, nextUsername, nextIcon, nextColor, resolvedMetadata.description, resolvedMetadata.role, resolvedMetadata.provider, resolvedMetadata.model, resolvedMetadata.surfaceTypeProvided ? 1 : 0, resolvedMetadata.surfaceType, now, now, deps.tenantId, String(existingRow.id || '').trim());
-        const refreshed = deps.db.prepare(`
+        `).run(nextName, nextUsername, nextIcon, nextColor, resolvedMetadata.description, resolvedMetadata.role, resolvedMetadata.provider, resolvedMetadata.model, now, now, resolvedMetadata.surfaceTypeProvided ? 1 : 0, resolvedMetadata.surfaceType, resolvedSeatScope.seatScopeProvided ? 1 : 0, resolvedSeatScope.seatScope, deps.tenantId, canonicalId);
+        const reused = deps.db.prepare(`
             SELECT *
             FROM ai_profiles
             WHERE tenant_id = ? AND id = ?
             LIMIT 1
-        `).get(deps.tenantId, String(existingRow.id || '').trim());
-        if (!refreshed) {
+        `).get(deps.tenantId, canonicalId);
+        if (!reused) {
             throw deps.createRuleError('Failed to refresh AI profile', 500, 'AI_PROFILE_REFRESH_FAILED');
         }
         return {
             created: false,
-            profile: hydrateAiProfileRecord(deps, refreshed)
+            profile: hydrateAiProfileRecord(deps, reused),
+            ...(exactMatch.matchCount > 1 ? {
+                duplicateWarning: {
+                    existingProfileId: canonicalId,
+                    message: `Multiple profiles matched "${name}". Reused ${canonicalId}; merge the remaining duplicates.`
+                }
+            } : {})
         };
     }
-    const exactMatches = deps.db.prepare(`
+    const archivedMatches = deps.db.prepare(`
         SELECT *
         FROM ai_profiles
         WHERE tenant_id = ?
           AND workspace_id = ?
+          AND archived_at IS NOT NULL
           AND (
                 LOWER(name) = LOWER(?)
                 OR LOWER(username) = LOWER(?)
           )
         ORDER BY COALESCE(last_active_at, updated_at, created_at) DESC, id ASC
     `).all(deps.tenantId, normalizedWorkspaceId, name, deps.normalizeAiProfileUsername(undefined, name));
-    if (exactMatches.length > 0) {
-        const canonicalId = String(exactMatches[0].id || '').trim();
+    const archivedMatch = selectAiProfileIdentityMatch(deps, archivedMatches, identityMetadata, trustedSeatScope);
+    if (archivedMatch.row) {
+        const canonicalId = String(archivedMatch.row.id || '').trim();
         const nextName = name;
         const nextUsername = deps.normalizeAiProfileUsername(undefined, nextName);
         const nextIcon = deps.normalizeAiProfileIcon(input.icon);
@@ -372,7 +1359,7 @@ export function resolveAiProfileService(deps, input) {
         const nextRole = normalizeOptionalProfileField(input.role);
         const nextProvider = normalizeOptionalProfileField(input.provider);
         const nextModel = normalizeOptionalProfileField(input.model);
-        const existingProfile = deps.aiProfileRowToRecord(exactMatches[0]);
+        const existingProfile = deps.aiProfileRowToRecord(archivedMatch.row);
         const resolvedMetadata = resolveAiProfileMetadataFields(deps, {
             name: nextName,
             description: nextDescription,
@@ -381,6 +1368,10 @@ export function resolveAiProfileService(deps, input) {
             model: nextModel,
             surfaceType: input.surfaceType,
         }, existingProfile);
+        const resolvedSeatScope = resolveTrustedAiProfileSeatScope(deps, trustedSeatScope, existingProfile);
+        if (requiresCloudSeatReservation(existingProfile, resolvedSeatScope.seatScope)) {
+            assertAiProfileSeatAvailable(deps, normalizedWorkspaceId);
+        }
         deps.db.prepare(`
             UPDATE ai_profiles
             SET name = ?,
@@ -393,41 +1384,35 @@ export function resolveAiProfileService(deps, input) {
                 model = COALESCE(?, model),
                 last_active_at = ?,
                 updated_at = ?,
+                archived_at = NULL,
+                archived_by = NULL,
+                archived_reason = NULL,
+                merged_into_profile_id = NULL,
+                roster_state_updated_at = ?,
                 surface_type = CASE
                     WHEN ? = 1 THEN ?
                     ELSE surface_type
+                END,
+                seat_scope = CASE
+                    WHEN ? = 1 THEN ?
+                    ELSE seat_scope
                 END
             WHERE tenant_id = ? AND id = ?
-        `).run(nextName, nextUsername, nextIcon, nextColor, resolvedMetadata.description, resolvedMetadata.role, resolvedMetadata.provider, resolvedMetadata.model, now, now, resolvedMetadata.surfaceTypeProvided ? 1 : 0, resolvedMetadata.surfaceType, deps.tenantId, canonicalId);
-        const reused = deps.db.prepare(`
+        `).run(nextName, nextUsername, nextIcon, nextColor, resolvedMetadata.description, resolvedMetadata.role, resolvedMetadata.provider, resolvedMetadata.model, now, now, now, resolvedMetadata.surfaceTypeProvided ? 1 : 0, resolvedMetadata.surfaceType, resolvedSeatScope.seatScopeProvided ? 1 : 0, resolvedSeatScope.seatScope, deps.tenantId, canonicalId);
+        const reactivated = deps.db.prepare(`
             SELECT *
             FROM ai_profiles
             WHERE tenant_id = ? AND id = ?
             LIMIT 1
         `).get(deps.tenantId, canonicalId);
-        if (!reused) {
+        if (!reactivated) {
             throw deps.createRuleError('Failed to refresh AI profile', 500, 'AI_PROFILE_REFRESH_FAILED');
         }
         return {
             created: false,
-            profile: hydrateAiProfileRecord(deps, reused),
-            ...(exactMatches.length > 1 ? {
-                duplicateWarning: {
-                    existingProfileId: canonicalId,
-                    message: `Multiple profiles matched "${name}". Reused ${canonicalId}; merge the remaining duplicates.`
-                }
-            } : {})
+            profile: hydrateAiProfileRecord(deps, reactivated)
         };
     }
-    const aiProfileUsage = deps.countAiProfileUsage(normalizedWorkspaceId);
-    if (aiProfileUsage.limit !== null && aiProfileUsage.used >= aiProfileUsage.limit) {
-        throw deps.createRuleError('No AI seats are available for this workspace. Remove an existing AI profile or upgrade your plan.', 403, 'AI_PROFILE_LIMIT_REACHED', {
-            workspaceId: normalizedWorkspaceId,
-            limit: aiProfileUsage.limit,
-            used: aiProfileUsage.used,
-            remaining: aiProfileUsage.remaining
-        });
-    }
     const id = deps.generateEntityId('ai-profile');
     const issuedProfileToken = deps.issueProfileToken();
     const username = deps.normalizeAiProfileUsername(undefined, name);
@@ -445,15 +1430,21 @@ export function resolveAiProfileService(deps, input) {
         model,
         surfaceType: input.surfaceType,
     }, null);
+    const resolvedSeatScope = resolveTrustedAiProfileSeatScope(deps, trustedSeatScope, null);
+    if (resolvedSeatScope.seatScope === 'cloud_metered') {
+        assertAiProfileSeatAvailable(deps, normalizedWorkspaceId);
+    }
     const providerMetadata = input.providerMetadata && typeof input.providerMetadata === 'object'
         ? input.providerMetadata
         : null;
     deps.db.prepare(`
         INSERT INTO ai_profiles (
             id, tenant_id, workspace_id, profile_token, name, username, icon, color,
-            description, role, provider, model, surface_type, provider_metadata_json, created_at, updated_at, last_active_at
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-    `).run(id, deps.tenantId, normalizedWorkspaceId, issuedProfileToken, name, username, icon, color, resolvedMetadata.description, resolvedMetadata.role, resolvedMetadata.provider, resolvedMetadata.model, resolvedMetadata.surfaceType, providerMetadata ? JSON.stringify(providerMetadata) : null, now, now, now);
+            avatar_url, avatar_source_url, description, role, provider, model, surface_type, seat_scope, provider_metadata_json,
+            archived_at, archived_by, archived_reason, merged_into_profile_id,
+            roster_state_updated_at, created_at, updated_at, last_active_at
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `).run(id, deps.tenantId, normalizedWorkspaceId, issuedProfileToken, name, username, icon, color, null, null, resolvedMetadata.description, resolvedMetadata.role, resolvedMetadata.provider, resolvedMetadata.model, resolvedMetadata.surfaceType, resolvedSeatScope.seatScope, providerMetadata ? JSON.stringify(providerMetadata) : null, null, null, null, null, now, now, now, now);
     const created = deps.db.prepare(`
         SELECT *
         FROM ai_profiles