#442

backend/app/models/history_access.rb

@@ -4,7 +4,7 @@ require 'digest'
 class HistoryAccess < ActiveSupport::CurrentAttributes
   attribute :user
   class Forbidden < StandardError; end
-  ARTIFACT_POLICY = 'counts-private-predicates-4'.freeze
+  ARTIFACT_POLICY = 'counts-masked-summary-1'.freeze
 
   KEYS = { 'post_versions' => ['post_id'], 'tag_versions' => ['tag_id'],
            'nico_tag_versions' => ['tag_id'],

backend/app/services/counts_axes.rb

@@ -1,41 +1,12 @@
 class CountsAxes
   MAX_AXES = 8
-  MASKED_TEXT = '********'.freeze
   MASKED_VALUE = '__counts_private__'.freeze
-  PUBLIC_FIELDS = ['resource_id', 'version_no', 'event_type', 'user',
-                   'created_at'].freeze
+  PUBLIC_FIELDS = ['created_at', 'event_type'].freeze
   class TooManyAxes < ArgumentError; end
   class PrivateCondition < ArgumentError; end
 
   GRAINS = ['year', 'quarter', 'month', 'week', 'day', 'hour'].freeze
 
-  def self.private_field?(field)
-    !PUBLIC_FIELDS.include?(field) && field != 'user.id'
-  end
-
-  def self.visible_ids_sql(definition)
-    "SELECT counts_visible.id FROM #{ definition.table } counts_visible WHERE " +
-        HistoryAccess.sql(definition.model, 'counts_visible')
-  end
-
-  def self.visibility_sql(definition, field)
-    return 'TRUE' if HistoryAccess.admin?
-
-    source = visible_ids_sql(definition)
-    visible = "v.id IN (#{ source })"
-    return visible unless field == 'changed_field'
-
-    "(#{ visible }) AND (previous.id IS NULL OR previous.id IN (#{ source }))"
-  end
-
-  def self.masked_sql(expression, definition, field)
-    return expression if HistoryAccess.admin? || !private_field?(field)
-
-    visible = visibility_sql(definition, field)
-    quoted = ApplicationRecord.connection.quote(MASKED_VALUE)
-    "CASE WHEN #{ visible } THEN #{ expression } ELSE #{ quoted } END"
-  end
-
   def self.time_expression(expression, grain, timezone)
     raise ArgumentError unless GRAINS.include?(grain)
 
@@ -89,9 +60,13 @@ class CountsAxes
         @definition.fields[field] == :datetime ? self.class.time_expression(
             expression, axis.fetch('grain', 'month'), @population.timezone) : expression
       end
-      if !HistoryAccess.admin? && self.class.private_field?(field)
-        expression = self.class.masked_sql(
-            "CAST((#{ expression }) AS CHAR)", @definition, field)
+      if !HistoryAccess.admin? && !PUBLIC_FIELDS.include?(field)
+        visible = HistoryAccess.sql(@definition.model, 'v')
+        if field == 'changed_field'
+          visible = "(#{ visible }) AND (#{ HistoryAccess.sql(@definition.model, 'previous') })"
+        end
+        expression = "CASE WHEN #{ visible } " +
+            "THEN CAST((#{ expression }) AS CHAR) ELSE '#{ MASKED_VALUE }' END"
       end
       expression
     end
@@ -102,12 +77,10 @@ class CountsAxes
     selected = indexes.map { "#{ expressions[_1] } AS a#{ _1 }" }
     identities = ['v.id']
     if rows.any? { _1['field'] == 'tags' }
-      identities << self.class.masked_sql(
-          "COALESCE(CONCAT('internal:', tag_entry.tag_id), " +
-              "CONCAT('external:', tag_entry.external_tag_id))", @definition, 'tags')
-      if rows.any? { _1['field'] == 'changed_field' }
-        identities << self.class.masked_sql('changed.field_key', @definition, 'changed_field')
-      end
+      # Raw identities stay inside COUNT; masked tag occurrences remain additive.
+      identities << "COALESCE(CONCAT('internal:', tag_entry.tag_id), " +
+          "CONCAT('external:', tag_entry.external_tag_id))"
+      identities << 'changed.field_key' if rows.any? { _1['field'] == 'changed_field' }
     end
     members = identities.each_index.map { "counts_member_#{ _1 }" }
     selected += identities.each_with_index.map { |expression, index|
@@ -125,17 +98,8 @@ class CountsAxes
   def joins(fields = all.map { _1['field'] })
     result = ''
     if fields.include?('tags')
-      document = 'CAST(v.tags_json AS JSON)'
-      unless HistoryAccess.admin?
-        visible = self.class.visible_ids_sql(@definition)
-        result += " LEFT JOIN (#{ visible }) counts_tags_visible " +
-            'ON counts_tags_visible.id = v.id '
-        document = "CASE WHEN counts_tags_visible.id IS NOT NULL " +
-            "THEN #{ document } ELSE JSON_ARRAY(" +
-            "JSON_OBJECT('tag_id', 0)) END"
-      end
       result += <<~SQL.squish
-         JOIN JSON_TABLE(#{ document }, '$[*]' COLUMNS (
+         JOIN JSON_TABLE(CAST(v.tags_json AS JSON), '$[*]' COLUMNS (
           tag_id BIGINT PATH '$.tag_id' NULL ON EMPTY,
           external_tag_id BIGINT PATH '$.external_tag_id' NULL ON EMPTY)) tag_entry
 
@@ -148,13 +112,6 @@ class CountsAxes
       condition = @definition.changes.map do |field|
         "(changed.field_key = '#{ field }' AND #{ @population.changed_sql(field) })"
       end.join(' OR ')
-      unless HistoryAccess.admin?
-        visible = self.class.visibility_sql(@definition, 'changed_field')
-        marker = ApplicationRecord.connection.quote(MASKED_VALUE)
-        fields += " UNION ALL SELECT #{ marker } AS field_key"
-        condition = "((#{ visible }) AND (#{ condition })) OR " +
-            "(NOT (#{ visible }) AND changed.field_key = #{ marker })"
-      end
       result += " JOIN (#{ fields }) changed ON (#{ condition })"
     end
     result

backend/app/services/counts_candidates.rb

@@ -6,14 +6,8 @@ class CountsCandidates
 
   def initialize(params)
     QueryState.validate!(params, KEYS)
-    definition = CountsResourceDefinition.new(params.fetch('resource'))
-    fields = ['resource_id', 'user']
-    fields += ['tags', 'tags_json', 'tags.id'] if definition.resource == 'posts'
-    fields << 'members' if definition.resource == 'tag_groups'
-    if definition.resource == 'materials'
-      fields += ['updated_by_user_id', 'file_blob_id', 'source_file_id', 'drive_file_id']
-    end
-    raise ArgumentError unless fields.include?(params.fetch('field'))
+    raise ArgumentError unless params.fetch('resource') == 'posts'
+    raise ArgumentError unless ['tags', 'tags_json'].include?(params.fetch('field'))
 
     @params = params
     @page = Integer(params.fetch('page', '1'), 10)
@@ -24,27 +18,25 @@ class CountsCandidates
   end
 
   def call
-    references = ['tags', 'tags_json', 'tags.id', 'members']
-    return resource_candidates unless references.include?(@params['field'])
-
     options = @params.slice('locale', 'at', 'execution_at', 'timezone')
         .merge('definition' => 'latest', 'resource' => 'tags')
     internal = CountsPopulation.new(options)
-    groups_flg = @params['field'] == 'members'
-    external = CountsPopulation.new(options.merge(
-        'resource' => groups_flg ? 'tag_groups' : 'nico_tags',
+    external = CountsPopulation.new(options.merge('resource' => 'nico_tags',
         'execution_at' => internal.at.iso8601(6)))
     connection = TagVersion.connection
     sources = [[internal, 'internal', 'v.category', 'v.names'],
-        [external, groups_flg ? 'group' : 'external', 'NULL', 'JSON_OBJECT()']]
+               [external, 'external', 'NULL', 'JSON_OBJECT()']]
     sources = sources.map do |population, kind, category, names|
       scope = population.scope.except(:select)
-      identity = "v.#{ population.definition.keys.first }"
-      scope = search(scope, identity, 'v.name', names)
-      value = ['tags.id', 'members'].include?(@params['field']) ?
-          "CAST(#{ identity } AS CHAR)" : "CONCAT('#{ kind }:', #{ identity })"
+      if @params['query'].present?
+        pattern = "%#{ ApplicationRecord.sanitize_sql_like(@params['query']) }%"
+        scope = scope.where("(v.name LIKE ? OR CAST(v.tag_id AS CHAR) = ? OR EXISTS (" +
+            "SELECT 1 FROM JSON_TABLE(COALESCE(JSON_EXTRACT(#{ names }, '$**.name'), " +
+            "JSON_ARRAY()), '$[*]' COLUMNS (name TEXT PATH '$')) candidate_name " +
+            'WHERE candidate_name.name LIKE ?))', pattern, @params['query'], pattern)
+      end
       scope.select(Arel.sql(
-          "#{ value } AS value, #{ identity } AS id, " +
+          "CONCAT('#{ kind }:', v.tag_id) AS value, v.tag_id AS id, " +
           "v.name AS name, #{ names } AS names, #{ category } AS category, '#{ kind }' AS kind"))
           .to_sql
     end
@@ -63,63 +55,4 @@ class CountsCandidates
     { rows: rows.first(LIMIT), page: @page, more: rows.length > LIMIT,
       execution_at: internal.at.iso8601(6) }
   end
-
-  private
-
-  def search(scope, identity, name, names)
-    return scope if @params['query'].blank?
-
-    pattern = "%#{ ApplicationRecord.sanitize_sql_like(@params['query']) }%"
-    scope.where("(#{ name } LIKE ? OR CAST(#{ identity } AS CHAR) = ? OR EXISTS (" +
-        "SELECT 1 FROM JSON_TABLE(COALESCE(JSON_EXTRACT(#{ names }, '$**.name'), " +
-        "JSON_ARRAY()), '$[*]' COLUMNS (name TEXT PATH '$')) candidate_name " +
-        'WHERE candidate_name.name LIKE ?))', pattern, @params['query'], pattern)
-  end
-
-  def resource_candidates
-    options = @params.slice('at', 'execution_at', 'timezone')
-        .merge('resource' => @params.fetch('resource'), 'definition' => 'latest')
-    actor_flg = ['user', 'updated_by_user_id'].include?(@params['field'])
-    options['definition'] = 'history' if actor_flg
-    population = CountsPopulation.new(options)
-    scope = population.scope.except(:select)
-    if actor_flg
-      point = population.timestamp(@params['at']) || population.at
-      raise ArgumentError if point > population.at
-
-      column = @params['field'] == 'user' ? 'created_by_user_id' : 'updated_by_user_id'
-      identities = scope.where('v.created_at <= ?', point).select("v.#{ column }")
-      scope = User.where(id: identities)
-      identity = 'users.id'
-      name = 'users.name'
-      names = 'JSON_OBJECT()'
-    else
-      definition = population.definition
-      column = @params['field'] == 'resource_id' ? definition.keys.first : @params['field']
-      if column == 'drive_file_id'
-        column = 'source_file_id'
-        scope = scope.where('v.source_kind' => 'google_drive_file')
-      end
-      identity = "v.#{ column }"
-      label = ['title', 'name', 'url'].find { definition.fields.key?(_1) }
-      name = label ? "v.#{ label }" : 'NULL'
-      names = definition.resource == 'tags' ? 'v.names' : 'JSON_OBJECT()'
-      if ['file_blob_id', 'source_file_id', 'drive_file_id'].include?(@params['field'])
-        scope = scope.where.not("v.#{ column }" => nil).group(Arel.sql(identity))
-        name = 'v.file_filename'
-      end
-    end
-    scope = search(scope, identity, name, names)
-    title = ['file_blob_id', 'source_file_id', 'drive_file_id'].include?(@params['field']) ?
-        "MIN(#{ name })" : name
-    query = scope.optimizer_hints('MAX_EXECUTION_TIME(10000)').distinct
-        .select(Arel.sql("#{ identity } AS id, #{ title } AS name, #{ names } AS names"))
-        .order(Arel.sql(identity)).limit(LIMIT + 1).offset((@page - 1) * LIMIT)
-    rows = scope.klass.connection.select_all(query.to_sql).to_a.map do |values|
-      values['names'] = JSON.parse(values['names']) if values['names'].is_a?(String)
-      values.merge('value' => values.fetch('id').to_s)
-    end
-    { rows: rows.first(LIMIT), page: @page, more: rows.length > LIMIT,
-      execution_at: population.at.iso8601(6) }
-  end
 end

backend/app/services/counts_condition.rb

@@ -82,32 +82,14 @@ class CountsCondition
 
   def apply(scope, entry)
     raise ArgumentError unless entry.is_a?(Hash)
-
     if entry['operator'] == 'axis_eq'
       raise ArgumentError unless (entry.keys - ['field', 'operator', 'grain', 'value']).empty?
       value = entry['value']
-      unless (value.nil? || value.is_a?(String) || value.is_a?(Numeric) ||
-          [true, false].include?(value))
+      unless value.nil? || value.is_a?(String) || value.is_a?(Numeric) || [true, false].include?(value)
         raise ArgumentError
       end
       raise ArgumentError if value.is_a?(String) && value.bytesize > 8192
 
-      if (!HistoryAccess.admin? && CountsAxes.private_field?(entry['field']) &&
-          (value == CountsAxes::MASKED_VALUE ||
-              (value == CountsAxes::MASKED_TEXT &&
-                  (@definition.fields[entry['field']] != :string ||
-                      ['tags', 'changed_field'].include?(entry['field'])))))
-        field = entry.fetch('field')
-        raise ArgumentError unless @definition.axes(@population.history).include?(field)
-        if entry.key?('grain')
-          unless (@definition.fields[field] == :datetime &&
-              CountsAxes::GRAINS.include?(entry['grain']))
-            raise ArgumentError
-          end
-        end
-        return scope.none
-      end
-      scope = @population.condition_scope(scope, entry.fetch('field'))
       return @population.axis_condition(scope, entry)
     end
     allowed = ['field', 'operator', 'value', 'end', 'blank', 'input', 'values']
@@ -129,13 +111,6 @@ class CountsCondition
 
     source, expression = source_for(field[:key])
     type = field[:type]
-    # Preserve typed input compatibility; display markers are never real typed values.
-    if (!HistoryAccess.admin? && CountsAxes.private_field?(field[:key]) &&
-        entry['value'] == CountsAxes::MASKED_TEXT && type != :string && !entry['blank'])
-      return scope.none unless entry['operator'] == 'ne'
-
-      return @population.condition_scope(scope, field[:key])
-    end
     blank = blank_sql(expression, type)
     if entry['blank']
       sql = if source && field[:collection]
@@ -144,7 +119,6 @@ class CountsCondition
               "NOT EXISTS (SELECT 1 FROM #{ source } WHERE NOT (#{ blank }))"
             else blank
             end
-      scope = @population.condition_scope(scope, field[:key])
       return scope.where(Arel.sql(sql))
     end
     if ['in', 'not_in', 'any', 'all', 'none'].include?(entry['operator'])
@@ -157,7 +131,6 @@ class CountsCondition
     validate_enum!(field[:key], parsed.first) if type == :enum
     operator = entry['operator']
     if type == :interval
-      scope = @population.condition_scope(scope, field[:key])
       return interval(scope, source, expression, parsed)
     end
     clauses = []
@@ -185,7 +158,6 @@ class CountsCondition
     elsif operator == 'ne'
       predicate = "(NOT (#{ predicate }) OR #{ blank })"
     end
-    scope = @population.condition_scope(scope, field[:key])
     scope.where(predicate, *binds)
   end
 
@@ -196,13 +168,6 @@ class CountsCondition
 
     values = entry['values']
     raise ArgumentError unless values.is_a?(Array) && values.length <= 100
-    if (!HistoryAccess.admin? && CountsAxes.private_field?(field[:key]) &&
-        values.include?(CountsAxes::MASKED_TEXT) &&
-        (field[:type] != :string || field[:set_type] == 'tag_reference'))
-      return scope.none if entry['operator'] == 'all'
-
-      values = values - [CountsAxes::MASKED_TEXT]
-    end
     raise ArgumentError if [entry['value'], entry['end']].any? { !_1.nil? && _1 != '' }
 
     parsed = values.map do |value|
@@ -226,10 +191,7 @@ class CountsCondition
 
     operator = entry['operator']
     if parsed.empty?
-      return scope.none if ['in', 'any'].include?(operator)
-      return scope if entry['values'].empty?
-
-      return @population.condition_scope(scope, field[:key])
+      return ['in', 'any'].include?(operator) ? scope.none : scope
     end
     source, expression = source_for(field[:key])
     if field[:set_type] == 'tag_reference'
@@ -250,7 +212,6 @@ class CountsCondition
       predicate = source ? "NOT #{ predicate }" :
           "(NOT #{ predicate } OR #{ blank_sql(expression, field[:type]) })"
     end
-    scope = @population.condition_scope(scope, field[:key])
     scope.where(predicate, *parsed)
   end
 

backend/app/services/counts_population.rb

@@ -70,13 +70,6 @@ class CountsPopulation
     @authorisation_flg ? HistoryAccess.sql(model, row) : 'TRUE'
   end
 
-  # Each predicate keeps its own visibility restriction, including OR branches.
-  def condition_scope(scope, field)
-    return scope if HistoryAccess.admin? || !CountsAxes.private_field?(field)
-
-    scope.where(Arel.sql(CountsAxes.visibility_sql(definition, field)))
-  end
-
   def axis_condition(scope, entry)
     raise CountsAxes::PrivateCondition if entry['value'] == CountsAxes::MASKED_VALUE
 
@@ -216,7 +209,6 @@ class CountsPopulation
   def apply_tags
     raise ArgumentError unless definition.resource == 'posts'
 
-    @scope = condition_scope(@scope, 'tags')
     if params['tag'].present?
       @scope = @scope.where(snapshot_membership(
           "#{ params.fetch('kind', 'internal') }:#{ params['tag'] }"))

backend/app/services/counts_table_export.rb

@@ -253,7 +253,7 @@ class CountsTableExport
   end
 
   def summary_value(value, index, page)
-    return CountsAxes::MASKED_TEXT if value == CountsAxes::MASKED_VALUE
+    return '********' if value == CountsAxes::MASKED_VALUE
 
     field = @query.axes.all.fetch(index).fetch('field')
     return @labels.fetch('bot', '') if field == 'user' && value.nil?

backend/app/services/counts_table_query.rb

@@ -220,11 +220,19 @@ class CountsTableQuery
 
   private
 
-  # Private predicates require visibility independently of their operator.
-  # Ordering/measure state must not select a server-only masked coordinate.
+  # Public timeline predicates may include hidden records. Private predicates must
+  # never become a count oracle, even when the selected axes themselves are public.
   def validate_summary_conditions!
     return if mode != 'summary' || HistoryAccess.admin?
 
+    fields = QueryState.records(@params, 'conditions') + QueryState.records(@params, 'drill')
+    private_fields = fields.any? { !CountsAxes::PUBLIC_FIELDS.include?(_1['field']) }
+    keys = ['tags', 'tag', 'kind', 'resource_id', 'user_id']
+    private_parameters = keys.any? do |key|
+      @params.any? { |name, value| (name == key || name.start_with?("#{ key }.")) && value != '' }
+    end
+    raise CountsAxes::PrivateCondition if private_fields || private_parameters
+
     ['column_order', 'measures'].each do |key|
       # Coordinates are compared only to already masked expressions, never raw
       # values. Public coordinates remain sortable; a guessed private ID cannot match.

backend/db/seeds.rb

@@ -9,21 +9,8 @@
 #   end
 
 ApplicationRecord.transaction do
-  Language.find_or_create_by!(code: 'ja') { _1.name = '日本語' }
-  Script.find_or_create_by!(code: 'Jpan') { _1.name = '漢字、仮名文字およびラテン文字' }
-  Region.find_or_create_by!(code: 392) do
-    _1.alpha_code = 'JP'
-    _1.name = '日本国'
-  end
-  Locale.find_or_create_by!(code: 'ja') do
-    _1.language_code = 'ja'
-    _1.script_code = 'Jpan'
-    _1.region_code = 392
-    _1.name = '日本語'
-  end
-
-  Language.find_or_create_by!(code: 'ain') { _1.name = 'ヤウンモシルン　アイヌ　イタㇰ' }
-  Script.find_or_create_by!(code: 'Kana') { _1.name = 'カナモジ　オヨビ　ラテンモジ' }
+  Language.find_or_create_by!(code: 'ain') { _1.name = 'ain' }
+  Script.find_or_create_by!(code: 'Kana') { _1.name = 'Kana' }
 end
 
 post_url_sanitisation_rules = [

backend/spec/requests/counts_masked_search_spec.rb

@@ -1,196 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe 'Counts masked search', type: :request do
-  let!(:tag) { create(:tag, primary_name: '秘密のタグ') }
-  let(:actor) { create(:user, :member) }
-  let(:admin) { create(:user, :admin) }
-  let(:base) do
-    { 'resource' => 'tags', 'definition' => 'history', 'mode' => 'summary',
-      'locale' => 'ja', 'execution_at' => '2025-01-01T00:00:00Z',
-      'timezone' => 'UTC', 'rows' => '', 'cols' => '', 'sort' => '' }
-  end
-
-  before do
-    [1, 2].each do |number|
-      TagVersion.create!(tag:, version_no: number,
-          event_type: number == 1 ? 'create' : 'discard', name: '秘密のタグ',
-          category: 'general', aliases: '秘密の別名', parent_tag_ids: '',
-          names: { ja: { name: '秘密のタグ', script_code: 'Jpan', auto_generated: false,
-                        aliases: [{ name: '秘密の別名', script_code: 'Jpan' }] } },
-          created_by_user: actor, created_at: Time.utc(2023, number))
-    end
-  end
-
-  def query(extra = {})
-    get '/counts/query', params: base.merge(extra)
-    expect(response).to have_http_status(:ok), extra.inspect
-    response.parsed_body
-  end
-
-  def predicate(field, operator, value, index = 0)
-    prefix = "conditions.#{ index }"
-    result = { 'conditions' => '', "#{ prefix }.field" => field,
-               "#{ prefix }.operator" => operator }
-    if ['in', 'any', 'all', 'none', 'not_in'].include?(operator)
-      result.merge!("#{ prefix }.values" => '1', 'condition_values' => '',
-          "condition_values.#{ index }.condition" => index.to_s,
-          "condition_values.#{ index }.value_type" => 'string',
-          "condition_values.#{ index }.value" => value)
-    else
-      result["#{ prefix }.value"] = value
-    end
-    result
-  end
-
-  it 'rejects every name and alias predicate on private history' do
-    ['name', 'name_ja', 'names.name', 'aliases.name', 'names.aliases.name'].each do |field|
-      secret = field.include?('aliases') ? '秘密の別名' : '秘密のタグ'
-      multiple = !['name', 'name_ja'].include?(field)
-      operators = multiple ? ['any', 'all', 'none'] : ['in', 'not_in']
-      ['eq', 'ne', 'like', *operators].each do |operator|
-        [secret, '********', '%', ''].each do |value|
-          expected = (value == '' && ['eq', 'ne', 'like'].include?(operator)) ? 2 : 0
-          expect(query(predicate(field, operator, value))['count']).to eq(expected)
-        end
-      end
-      blank = predicate(field, 'eq', '').merge('conditions.0.blank' => '1')
-      expect(query(blank)['count']).to eq(0)
-    end
-  end
-
-  it 'ignores missing and empty scalar values unless blank is checked' do
-    ['name', 'name_ja', 'names.name', 'aliases.name'].each do |field|
-      ['eq', 'ne', 'like'].each do |operator|
-        condition = predicate(field, operator, '')
-        [condition, condition.except('conditions.0.value')].each do |empty|
-          expect(query(empty)['count']).to eq(2)
-          expect(query(empty.merge('conditions.0.blank' => '0'))['count']).to eq(2)
-          expect(query(empty.merge('conditions.0.blank' => '1'))['count']).to eq(0)
-        end
-      end
-    end
-  end
-
-  it 'keeps details totals unchanged for inactive private predicates' do
-    settings = predicate('name', 'ne', '').merge('mode' => 'details')
-    result = query(settings)
-    expect(result['count']).to eq(0)
-    expect(result['versions']).to be_empty
-    expect(result['output_count']).to eq(2)
-    active = query(settings.merge('conditions.0.blank' => '1'))
-    expect(active['output_count']).to eq(0)
-  end
-
-  it 'ignores missing sets but preserves explicit empty set semantics' do
-    { 'name' => ['in', 'not_in'], 'aliases.name' => ['any', 'all', 'none'] }.each do
-        |field, operators|
-      operators.each do |operator|
-        condition = { 'conditions' => '', 'conditions.0.field' => field,
-                      'conditions.0.operator' => operator }
-        expect(query(condition)['count']).to eq(2)
-        empty = condition.merge('conditions.0.values' => '1', 'condition_values' => '')
-        expected = ['in', 'any'].include?(operator) ? 0 : 2
-        expect(query(empty)['count']).to eq(expected)
-        expect(query(condition.merge('conditions.0.blank' => '1'))['count']).to eq(0)
-        # An explicit empty string element is a real value, not an unspecified set.
-        expect(query(predicate(field, operator, ''))['count']).to eq(0)
-      end
-    end
-  end
-
-  it 'ignores empty private predicates regardless of their position' do
-    first = predicate('name', 'ne', '')
-        .merge(predicate('resource_id', 'eq', tag.id.to_s, 1))
-    last = predicate('resource_id', 'eq', tag.id.to_s)
-        .merge(predicate('aliases.name', 'like', '', 1))
-    expect(query(first)['count']).to eq(2)
-    expect(query(last)['count']).to eq(2)
-    active = predicate('name', 'ne', 'unrelated')
-        .merge(predicate('aliases.name', 'like', '', 1))
-    expect(query(active)['count']).to eq(0)
-  end
-
-  it 'searches public literal markers and treats axis predicates as explicit' do
-    public_tag = create(:tag, primary_name: '********')
-    TagVersion.create!(tag: public_tag, version_no: 1, event_type: 'create',
-        name: '********', category: 'general', aliases: '', parent_tag_ids: '',
-        names: { ja: { name: '********', script_code: 'Jpan', auto_generated: false,
-                      aliases: [] } }, created_at: Time.utc(2023))
-    expect(query['count']).to eq(3)
-    ['eq', 'ne', 'like', 'in', 'not_in'].each do |operator|
-      expected = ['ne', 'not_in'].include?(operator) ? 0 : 1
-      expect(query(predicate('name', operator, '********'))['count']).to eq(expected)
-    end
-    blank = predicate('aliases.name', 'eq', '').merge('conditions.0.blank' => '1')
-    expect(query(blank)['count']).to eq(1)
-    ['********', '', nil].each do |value|
-      condition = { 'conditions' => '', 'conditions.0.field' => 'name',
-                    'conditions.0.operator' => 'axis_eq',
-                    'conditions.0.value_type' => value.nil? ? 'null' : 'string' }
-      condition['conditions.0.value'] = value unless value.nil?
-      expected = value == '********' ? 1 : 0
-      expect(query(condition)['count']).to eq(expected)
-      drill = { 'drill' => '', 'drill.0.field' => 'name',
-                'drill.0.value_type' => value.nil? ? 'null' : 'string' }
-      drill['drill.0.value'] = value unless value.nil?
-      expect(query(drill)['count']).to eq(expected)
-    end
-  end
-
-  it 'keeps public identity and timeline predicates searchable' do
-    expect(query['count']).to eq(2)
-    values = { 'resource_id' => tag.id.to_s, 'version_no' => '2',
-               'event_type' => 'discard', 'user' => actor.id.to_s,
-               'created_at' => '2023-02-01T00:00:00Z' }
-    values.each do |field, value|
-      expected = ['resource_id', 'user'].include?(field) ? 2 : 1
-      expect(query(predicate(field, 'eq', value))['count']).to eq(expected)
-    end
-    condition = predicate('name', 'ne', '秘密のタグ')
-        .merge(predicate('event_type', 'eq', 'discard', 1))
-    expect(query(condition)['count']).to eq(0)
-    expect(query(predicate('category', 'eq', '********'))['count']).to eq(0)
-    expect(query(predicate('category', 'eq', 'general'))['count']).to eq(0)
-  end
-
-  it 'keeps public predicates available after combining multiple conditions' do
-    condition = predicate('resource_id', 'eq', tag.id.to_s)
-        .merge(predicate('event_type', 'eq', 'discard', 1))
-    expect(query(condition)['count']).to eq(1)
-    condition.merge!(predicate('name', 'ne', 'unrelated', 2))
-    expect(query(condition)['count']).to eq(0)
-  end
-
-  it 'keeps real name searches for administrators and excludes private details' do
-    condition = predicate('name', 'eq', '秘密のタグ')
-    details = query(condition.merge('mode' => 'details'))
-    expect(details['versions']).to be_empty
-    expect(details['output_count']).to eq(0)
-    masked = query(predicate('name', 'eq', '********').merge('mode' => 'details'))
-    expect(masked['versions']).to be_empty
-    expect(masked['output_count']).to eq(0)
-    sign_in_as(admin)
-    expect(query(condition)['count']).to eq(2)
-    expect(query(condition.merge('mode' => 'details'))['versions'].length).to eq(2)
-  end
-
-  it 'rejects private names reached through a post tag snapshot' do
-    post = create(:post)
-    PostVersion.create!(post:, version_no: 1, event_type: 'create', title: 'post',
-        url: post.url, tags: '', parent_post_ids: '',
-        tags_json: [{ tag_id: tag.id, version_no: 1, name: '秘密のタグ',
-                     category: 'general', sections: [] }],
-        created_at: Time.utc(2024))
-    ['tags.name', 'tags.names.name', 'tags.name_ja'].each do |field|
-      ['eq', 'ne', 'like', 'any', 'all', 'none'].each do |operator|
-        ['秘密のタグ', '********', '%'].each do |value|
-          settings = predicate(field, operator, value).merge('resource' => 'posts')
-          expect(query(settings)['count']).to eq(0)
-        end
-      end
-      blank = predicate(field, 'eq', '').merge('resource' => 'posts',
-          'conditions.0.blank' => '1')
-      expect(query(blank)['count']).to eq(0)
-    end
-  end
-end

backend/spec/requests/counts_table_spec.rb

@@ -354,25 +354,15 @@ RSpec.describe 'Counts table API', type: :request do
     expect(result['cells'].sum { _1['count'] }).to eq(4)
     expect(response.body).not_to include('hidden title')
     masked = query(mode: 'summary', rows: 'resource_id', cols: '')
-    expect(masked['cells'].map { _1['values'] }).to eq([[record.id]])
+    expect(masked['cells'].map { _1['values'] }).to eq([[CountsAxes::MASKED_VALUE]])
     expect(masked['cells'].first['count']).to eq(4)
     expect(query['versions']).to be_empty
   end
 
-  it 'allows public identity predicates without exposing private snapshot fields' do
-    PostVersion.create!(post: record, version_no: 4, event_type: 'discard',
-        url: record.url, title: 'hidden title', tags: '', tags_json: [],
-        parent_post_ids: '', created_at: Time.utc(2024, 3))
-
-    get '/counts/query', params: base.merge(mode: 'summary',
-        resource_id: record.id.to_s, rows: 'resource_id', cols: 'title')
-
-    expect(response).to have_http_status(:ok)
-    expect(json['count']).to eq(4)
-    expect(json['cells'].sum { _1['count'] }).to eq(4)
-    expect(json['cells'].map { _1['values'].last })
-        .to include(CountsAxes::MASKED_VALUE)
-    expect(response.body).not_to include('hidden title')
+  it 'rejects private summary predicates instead of exposing a count oracle' do
+    get '/counts/query', params: base.merge(mode: 'summary', resource_id: record.id.to_s)
+    expect(response).to have_http_status(:forbidden)
+    expect(json).to eq('error' => 'private_condition')
   end
 
   it 'reports the combined axis limit without replacing it with a generic 400' do

backend/spec/services/counts_pivot_security_spec.rb

@@ -69,29 +69,27 @@ RSpec.describe 'Counts masked pivot contracts' do
     end
   end
 
-  it 'counts one opaque collection per private version across pages' do
+  it 'preserves five tag occurrences after merging private tags and across pages' do
     [nil, guest, member, admin].each do |user|
       page = result(user)
-      expected = user == admin ? 5 : 6
-      expect(grand(page)).to eq(expected)
-      expect(page[:cells].sum { _1[:count] }).to eq(expected)
+      expect(grand(page)).to eq(5)
+      expect(page[:cells].sum { _1[:count] }).to eq(5)
       expect(page).not_to have_key(:excluded_count)
       paged = result(user, 'limit' => '1')
-      expect(grand(paged)).to eq(expected)
+      expect(grand(paged)).to eq(5)
       expect(result(user, 'limit' => '1', 'page' => '2')[:group_count])
           .to eq(page[:group_count])
     end
     public_page = result(nil)
     hidden = public_page[:cells].select { _1[:values].first == CountsAxes::MASKED_VALUE }
-    expect(hidden.sum { _1[:count] }).to eq(4)
+    expect(hidden.sum { _1[:count] }).to eq(3)
     expect(public_page[:axis_labels]['a0']).not_to have_key("internal:#{ tags.first.id }")
     expect(public_page.to_json).not_to include('hidden-title', 'private-discard')
   end
 
   it 'retains distinct membership when tags are not a row axis' do
     [nil, admin].each do |user|
-      expect(grand(result(user, 'rows' => 'event_type', 'cols' => 'tags')))
-          .to eq(user == admin ? 3 : 5)
+      expect(grand(result(user, 'rows' => 'event_type', 'cols' => 'tags'))).to eq(3)
       expect(result(user, 'rows' => '', 'cols' => '')[:cells].sole[:count]).to eq(5)
       details = result(user, 'mode' => 'details', 'rows' => '', 'cols' => '')
       expect(details[:count]).to eq(user == admin ? 5 : 1)
@@ -123,13 +121,14 @@ RSpec.describe 'Counts masked pivot contracts' do
   it 'counts distinct changed records when tags are not additive row tuples' do
     [nil, admin].each do |user|
       page = result(user, 'rows' => 'changed_field', 'cols' => 'event_type')
-      expect(grand(page)).to eq(user == admin ? 2 : 4)
+      expect(grand(page)).to eq(2)
       if user.nil?
         expect(page[:cells].map { _1[:values].first }.uniq).to eq([CountsAxes::MASKED_VALUE])
       end
-      # Private empty collections contribute the same opaque tuple as populated ones.
-      combined = result(user, 'rows' => 'changed_field', 'cols' => 'tags')
-      expect(grand(combined)).to eq(user == admin ? 0 : 4)
+      # Changed discard snapshots have no tags: no full cell contributes here.
+      empty = result(user, 'rows' => 'changed_field', 'cols' => 'tags')
+      expect(empty[:cells]).to be_empty
+      expect(grand(empty)).to eq(0)
     end
   end
 
@@ -143,7 +142,7 @@ RSpec.describe 'Counts masked pivot contracts' do
     expect(page[:row_headers]).to include(hash_including(values: [nil], kind: 'data'))
   end
 
-  it 'sorts public version numbers numerically including formerly hidden records' do
+  it 'sorts public numeric values numerically alongside a masked group' do
     post = PostVersion.order(:id).last.post
     [2, 10].each do |number|
       PostVersion.create!(post:, version_no: number, event_type: 'update',
@@ -152,196 +151,27 @@ RSpec.describe 'Counts masked pivot contracts' do
     end
     page = result(nil, 'rows' => 'version_no', 'cols' => '')
     values = page[:row_headers].select { _1[:kind] == 'data' }.map { _1[:values].first }
-    expect(values.map(&:to_i)).to eq([1, 2, 10])
+    expect(values.reject { _1 == CountsAxes::MASKED_VALUE }.map(&:to_i)).to eq([1, 2, 10])
+    expect(values.last).to eq(CountsAxes::MASKED_VALUE)
   end
 
-  it 'keeps public identity predicates and excludes private attributes' do
-    hidden_id = PostVersion.first.post_id.to_s
-    base = { 'rows' => '', 'cols' => '' }
-    condition = lambda do |field, operator, value|
-      { 'conditions' => '', 'conditions.0.field' => field,
-        'conditions.0.operator' => operator, 'conditions.0.value' => value }
-    end
-
-    expect(result(nil, base.merge('resource_id' => hidden_id))[:cells].sole[:count]).to eq(2)
-    expect(result(nil, base.merge(condition.call('version_no', 'eq', '2')))[:cells]
-        .sole[:count]).to eq(2)
-    expect(result(nil, base.merge(condition.call('user', 'eq', member.id.to_s)))[:cells]
-        .sole[:count]).to eq(5)
-    expect(result(nil, base.merge(condition.call('title', 'eq', 'hidden-title-0')))[:cells]
-        .sole[:count]).to eq(0)
-    expect(result(nil, base.merge(condition.call('title', 'ne', 'hidden-title-0')))[:cells]
-        .sole[:count]).to eq(1)
-    expect(result(nil, base.merge(condition.call('title', 'eq', '********')))[:cells]
-        .sole[:count]).to eq(0)
-    expect(result(nil, base.merge(condition.call('video_ms', 'eq', '********')))[:cells]
-        .sole[:count]).to eq(0)
-    expect(result(nil, base.merge(condition.call('title', 'like', '%title%')))[:cells]
-        .sole[:count]).to eq(1)
-    expect(result(nil, base.merge(condition.call('title', 'like', '%')))[:cells]
-        .sole[:count]).to eq(1)
-    expect(result(nil, base.merge('tags' => 'C'))[:cells].sole[:count]).to eq(1)
-    expect(result(nil, base.merge('tags' => 'not:C'))[:cells].sole[:count]).to eq(0)
-  end
-
-  it 'retains public OR branches while rejecting private predicates on hidden rows' do
-    HistoryAccess.set(user: nil) do
-      population = CountsPopulation.new(params.merge('rows' => '', 'cols' => ''),
-          authorisation_flg: false)
-      condition = CountsCondition.new(population)
-      public_scope = condition.apply(population.scope,
-          { 'field' => 'event_type', 'operator' => 'eq', 'value' => 'discard' })
-      private_scope = condition.apply(population.scope,
-          { 'field' => 'title', 'operator' => 'ne', 'value' => 'unrelated' })
-      masked_scope = condition.apply(population.scope,
-          { 'field' => 'title', 'operator' => 'eq', 'value' => '********' })
-      expect(public_scope.except(:select).count).to eq(2)
-      expect(public_scope.or(private_scope).except(:select).count).to eq(3)
-      expect(private_scope.or(public_scope).except(:select).count).to eq(3)
-      expect(public_scope.or(masked_scope).except(:select).count).to eq(2)
-      expect(public_scope.merge(private_scope).except(:select).count).to eq(0)
-    end
-  end
-
-  it 'excludes private collections from positive, negative, AND and OR tag searches' do
-    settings = { 'rows' => '', 'cols' => '' }
-    { 'C' => 1, 'not:C' => 0, 'not:unknown' => 1, '********' => 0,
-      'not:********' => 1, 'not:C C' => 0, 'not:C type:or C' => 1 }.each do |value, count|
-      expect(result(nil, settings.merge('tags' => value))[:cells].sole[:count]).to eq(count)
-    end
-  end
-
-  it 'ignores empty numeric and interval bounds without restricting private history' do
-    settings = { 'rows' => '', 'cols' => '', 'conditions' => '' }
-    { 'video_ms' => ['eq', 'ne', 'gt', 'ge', 'lt', 'le', 'range'],
-      'tags.sections' => ['range'] }.each do |field, operators|
-      operators.each do |operator|
-        condition = settings.merge('conditions.0.field' => field,
-            'conditions.0.operator' => operator)
-        empty = condition.merge('conditions.0.value' => '')
-        expect(result(nil, condition)[:cells].sole[:count]).to eq(5)
-        expect(result(nil, empty)[:cells].sole[:count]).to eq(5)
-        expect(result(nil, empty.merge('conditions.0.blank' => '0'))[:cells]
-            .sole[:count]).to eq(5)
-        if operator == 'range'
-          empty['conditions.0.end'] = ''
-          expect(result(nil, empty)[:cells].sole[:count]).to eq(5)
-          ['conditions.0.value', 'conditions.0.end'].each do |key|
-            active = empty.merge(key => '100')
-            expect(result(nil, active)[:cells].sole[:count]).to eq(0)
-          end
-        end
-      end
-    end
-  end
-
-  it 'keeps typed marker sets active after incompatible marker values are removed' do
-    settings = { 'rows' => '', 'cols' => '', 'conditions' => '',
-                 'conditions.0.field' => 'video_ms', 'conditions.0.values' => '1',
-                 'condition_values' => '', 'condition_values.0.condition' => '0',
-                 'condition_values.0.value_type' => 'string',
-                 'condition_values.0.value' => '********' }
-    ['in', 'not_in'].each do |operator|
-      expected = operator == 'in' ? 0 : 1
-      condition = settings.merge('conditions.0.operator' => operator)
-      expect(result(nil, condition)[:cells].sole[:count]).to eq(expected)
-    end
-  end
-
-  it 'restricts active numeric comparisons and preserves empty selection semantics' do
-    settings = { 'rows' => '', 'cols' => '', 'conditions' => '',
-                 'conditions.0.field' => 'video_ms' }
-    ['eq', 'ne', 'gt', 'ge', 'lt', 'le', 'range'].each do |operator|
-      condition = settings.merge('conditions.0.operator' => operator,
-          'conditions.0.value' => '0')
-      condition['conditions.0.end'] = '100' if operator == 'range'
-      # The one public row is NULL; private NULLs and real values never match.
-      expected = operator == 'ne' ? 1 : 0
-      expect(result(nil, condition)[:cells].sole[:count]).to eq(expected)
-    end
-    ['in', 'not_in'].each do |operator|
-      condition = settings.merge('conditions.0.operator' => operator,
-          'conditions.0.values' => '1', 'condition_values' => '')
-      expected = operator == 'not_in' ? 5 : 0
-      expect(result(nil, condition)[:cells].sole[:count]).to eq(expected)
-    end
-    blank = settings.merge('conditions.0.operator' => 'eq', 'conditions.0.blank' => '1')
-    expect(result(nil, blank)[:cells].sole[:count]).to eq(1)
-  end
-
-  it 'preserves empty tag sets and restricts active blank collection predicates' do
-    settings = { 'rows' => '', 'cols' => '', 'conditions' => '',
-                 'conditions.0.field' => 'tags' }
-    ['any', 'all', 'none'].each do |operator|
-      condition = settings.merge('conditions.0.operator' => operator,
-          'conditions.0.values' => '1', 'condition_values' => '')
-      expected = operator == 'any' ? 0 : 5
-      expect(result(nil, condition)[:cells].sole[:count]).to eq(expected)
-    end
-    blank = settings.merge('conditions.0.operator' => 'eq', 'conditions.0.blank' => '1')
-    expect(result(nil, blank)[:cells].sole[:count]).to eq(0)
-  end
-
-  it 'rejects server-only coordinates in column order' do
-    probes = [
+  it 'rejects private predicates and supplied measure coordinates before SQL labels escape' do
+    probes = [{ 'resource_id' => PostVersion.first.post_id.to_s },
+        { 'tags' => 'A' },
+        { 'conditions' => '', 'conditions.0.field' => 'title', 'conditions.0.operator' => 'eq',
+          'conditions.0.value' => 'hidden-title-0' },
+        { 'drill' => '', 'drill.0.field' => 'tags', 'drill.0.value_type' => 'string',
+          'drill.0.value' => "internal:#{ tags.first.id }" },
         { 'cols' => 'tags', 'column_order' => '', 'column_order.0.value_type' => 'string',
           'column_order.0.value' => CountsAxes::MASKED_VALUE }]
     HistoryAccess.set(user: nil) do
       probes.each do |probe|
-        expect { CountsTableQuery.new(params.merge(probe)).call }
+        expect { CountsTableQuery.new(params.merge(probe)) }
             .to raise_error(CountsAxes::PrivateCondition)
       end
     end
   end
 
-
-  it 'keeps private collection and change counts independent of stored elements' do
-    settings = [
-        { 'rows' => 'tags', 'cols' => 'changed_field' },
-        { 'rows' => 'changed_field tags', 'cols' => '' }]
-    original = settings.map { result(nil, _1) }
-    snapshot = tags.map do |tag|
-      { tag_id: tag.id, version_no: 1, sections: [] }
-    end
-    hidden_posts = PostVersion.where(event_type: 'discard').pluck(:post_id)
-    PostVersion.where(post_id: hidden_posts).update_all(
-        title: 'same hidden value', tags_json: snapshot)
-    expect(settings.map { result(nil, _1) }).to eq(original)
-  end
-
-  it 'excludes private tag and change coordinates from drill conditions' do
-    ['tags', 'changed_field'].each do |field|
-      settings = { 'rows' => field, 'cols' => '' }
-      page = result(nil, settings)
-      cell = page[:cells].find { _1[:values] == [CountsAxes::MASKED_VALUE] }
-      expect(cell[:count]).to eq(4)
-      [CountsAxes::MASKED_VALUE, CountsAxes::MASKED_TEXT].each do |value|
-        drill = { 'drill' => '', 'drill.0.field' => field,
-                  'drill.0.value_type' => 'string', 'drill.0.value' => value }
-        expect(result(nil, settings.merge(drill))[:cells]).to be_empty
-        details = result(nil, settings.merge(drill).merge('mode' => 'details'))
-        expect(details[:versions]).to be_empty
-        condition = { 'conditions' => '', 'conditions.0.field' => field,
-                      'conditions.0.operator' => 'axis_eq',
-                      'conditions.0.value_type' => 'string', 'conditions.0.value' => value }
-        expect(result(nil, settings.merge(condition))[:cells]).to be_empty
-      end
-    end
-  end
-
-  it 'rejects real private tag and change coordinates for non-admin users' do
-    [nil, guest, member].each do |user|
-      { 'tags' => "internal:#{ tags.first.id }", 'changed_field' => 'title' }.each do
-          |field, value|
-        settings = { 'rows' => '', 'cols' => '', 'drill' => '',
-                     'drill.0.field' => field, 'drill.0.value_type' => 'string',
-                     'drill.0.value' => value }
-        expect(result(user, settings)[:cells].sole[:count]).to eq(0)
-        expect(result(admin, settings)[:cells].sole[:count]).to be > 0
-      end
-    end
-  end
-
   it 'keeps public column sorting usable while guessed private coordinates match nothing' do
     first = result(nil, 'rows' => 'event_type', 'cols' => 'tags')
     probe = result(nil, 'rows' => 'event_type', 'cols' => 'tags',
@@ -357,7 +187,7 @@ RSpec.describe 'Counts masked pivot contracts' do
     HistoryAccess.set(user: nil) do
       payload = params.merge('format' => 'json')
       json = JSON.parse(CountsTableExport.new(payload).body.to_a.join)
-      expect(json['data'].sum { _1['kind'] == 'data' ? _1['count'] : 0 }).to eq(6)
+      expect(json['data'].sum { _1['kind'] == 'data' ? _1['count'] : 0 }).to eq(5)
       expect(json.to_json).not_to include('hidden-title', 'private-discard')
       csv = CountsTableExport.new(payload.merge('format' => 'csv')).body.to_a.join
       expect(csv).to include('********')

frontend/src/components/PostEditForm.tsx

@@ -1,6 +1,5 @@
 import { useEffect, useMemo, useState } from 'react'
 
-import ResourcePickerButton from '@/components/common/ResourcePickerButton'
 import { useLocale } from '@/lib/useLocale'
 import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
 import FieldError from '@/components/common/FieldError'
@@ -185,12 +184,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
 	    value={parentPostIds}
 	    disabled={disabled}
 	    errors={fieldErrors.parentPostIds}
-	    onChange={setParentPostIds}
-	    after={<ResourcePickerButton
-		source={{ resource: 'posts', field: 'resource_id' }}
-		values={parentPostIds.split (/\s+/).filter (Boolean)}
-		maximum={Number.MAX_SAFE_INTEGER} disabled={disabled}
-		onSelect={values => setParentPostIds (values.join (' '))}/>}/>
+	    onChange={setParentPostIds}/>
 
 	<PostTagsField
 	    disabled={disabled}

frontend/src/components/TagSearch.test.tsx

@@ -1,120 +0,0 @@
-import { fireEvent, screen } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import { useLocation } from 'react-router-dom'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import TagSearch from '@/components/TagSearch'
-import * as api from '@/lib/api'
-import { buildTag } from '@/test/factories'
-import { renderWithProviders } from '@/test/render'
-
-
-const LocationOutput = () => {
-  const location = useLocation ()
-  return <output data-testid="location">{location.pathname}{location.search}</output>
-}
-
-
-const renderSearch = () => renderWithProviders (
-    <>
-      <TagSearch/>
-      <LocationOutput/>
-    </>, { route: '/ja/posts?page=3' })
-
-
-describe ('TagSearch', () => {
-  beforeEach (() => {
-    vi.spyOn (api, 'apiGet').mockResolvedValue ([])
-  })
-
-  it ('searches through native submission without an Enter key event', () => {
-    renderSearch ()
-    const input = screen.getByRole<HTMLInputElement> ('textbox')
-    fireEvent.change (input, { target: { value: '虹夏 not:TEST type:or' } })
-
-    expect (input.form).toBeInstanceOf (HTMLFormElement)
-    fireEvent.submit (input.form!)
-
-    const query = new URLSearchParams ({ tags: '虹夏 not:test', match: 'any' })
-    expect (screen.getByTestId ('location')).toHaveTextContent (
-	`/ja/posts?${ query }`)
-    expect (input).toHaveValue ('虹夏 not:test type:or')
-  })
-
-  it ('requests a search action from the software keyboard', () => {
-    renderSearch ()
-
-    expect (screen.getByRole ('textbox')).toHaveAttribute ('enterkeyhint', 'search')
-  })
-
-  it ('searches through the form when Enter is pressed', async () => {
-    const user = userEvent.setup ()
-    renderSearch ()
-
-    await user.type (screen.getByRole ('textbox'), '虹夏{Enter}')
-
-    const query = new URLSearchParams ({ tags: '虹夏', match: 'all' })
-    expect (screen.getByTestId ('location')).toHaveTextContent (
-	`/ja/posts?${ query }`)
-  })
-
-  it.each ([
-      { label: 'composition flag', composing: true, keyCode: 13 },
-      { label: 'legacy IME code', composing: false, keyCode: 229 }]) (
-      'cancels confirmation Enter with $label', ({ composing, keyCode }) => {
-    renderSearch ()
-    const input = screen.getByRole ('textbox')
-    fireEvent.change (input, { target: { value: '虹夏' } })
-    const uncancelled = fireEvent.keyDown (input, {
-	key: 'Enter', isComposing: composing, keyCode })
-
-    expect (uncancelled).toBe (false)
-    expect (screen.getByTestId ('location')).toHaveTextContent ('/ja/posts?page=3')
-    expect (input).toHaveValue ('虹夏')
-  })
-
-  it ('cancels Enter throughout composition even without keyboard IME flags', () => {
-    renderSearch ()
-    const input = screen.getByRole ('textbox')
-    fireEvent.compositionStart (input)
-    fireEvent.change (input, { target: { value: '虹夏' } })
-    const uncancelled = fireEvent.keyDown (input, {
-	key: 'Enter', isComposing: false, keyCode: 13 })
-
-    expect (uncancelled).toBe (false)
-    expect (screen.getByTestId ('location')).toHaveTextContent ('/ja/posts?page=3')
-    expect (input).toHaveValue ('虹夏')
-  })
-
-  it ('blocks direct submission during composition and allows it after confirmation', () => {
-    renderSearch ()
-    const input = screen.getByRole<HTMLInputElement> ('textbox')
-    fireEvent.compositionStart (input)
-    fireEvent.change (input, { target: { value: '虹夏' } })
-    fireEvent.submit (input.form!)
-
-    expect (screen.getByTestId ('location')).toHaveTextContent ('/ja/posts?page=3')
-    expect (input).toHaveValue ('虹夏')
-
-    fireEvent.compositionEnd (input)
-    fireEvent.submit (input.form!)
-
-    const query = new URLSearchParams ({ tags: '虹夏', match: 'all' })
-    expect (screen.getByTestId ('location')).toHaveTextContent (
-	`/ja/posts?${ query }`)
-  })
-
-  it ('selects the active suggestion without submitting the form', async () => {
-    vi.mocked (api.apiGet).mockResolvedValue ([buildTag ({ name: '虹夏' })])
-    const user = userEvent.setup ()
-    renderSearch ()
-
-    await user.type (screen.getByRole ('textbox'), '虹')
-    await screen.findByText ('虹夏')
-    await user.keyboard ('{ArrowDown}{Enter}')
-
-    expect (screen.getByRole ('textbox')).toHaveValue ('虹夏 ')
-    expect (screen.getByTestId ('location')).toHaveTextContent ('/ja/posts?page=3')
-    expect (screen.queryByText ('虹夏')).not.toBeInTheDocument ()
-  })
-})

frontend/src/components/TagSearch.tsx

@@ -1,6 +1,6 @@
 // TODO: タグ入力系すべてに同様の処理あるため共通化する．
 
-import { useEffect, useRef, useState } from 'react'
+import { useEffect, useState } from 'react'
 import { useLocation } from 'react-router-dom'
 
 import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
@@ -10,7 +10,7 @@ import { inputClass } from '@/lib/utils'
 
 import TagSearchBox from './TagSearchBox'
 
-import type { ChangeEvent, FC, FormEvent, KeyboardEvent } from 'react'
+import type { ChangeEvent, FC, KeyboardEvent } from 'react'
 
 import type { Tag } from '@/types'
 
@@ -20,7 +20,6 @@ const TagSearch: FC = () => {
   const locale = useLocale ()
   const location = useLocation ()
   const navigate = useLocaleNavigate ()
-  const compositionFlgRef = useRef (false)
 
   const [activeIndex, setActiveIndex] = useState (-1)
   const [search, setSearch] = useState ('')
@@ -75,34 +74,7 @@ const TagSearch: FC = () => {
     setSuggestionsVsbl (false)
   }, [locale])
 
-  const handleSubmit = (ev: FormEvent<HTMLFormElement>) => {
-    ev.preventDefault ()
-    if (compositionFlgRef.current)
-      return
-
-    const parts = search.split (' ')
-    const match =
-	parts.map (t => t.toLowerCase ()).includes ('type:or') ? 'any' : 'all'
-    navigate (`/posts?${
-	(new URLSearchParams ({
-	    tags: parts.map (t => t.toLowerCase ())
-		       .filter (t => t !== 'type:or')
-		       .join (' '),
-	    match })).toString () }`)
-    setSuggestionsVsbl (false)
-    setRequest ({ query: '' })
-  }
-
   const handleKeyDown = (ev: KeyboardEvent<HTMLInputElement>) => {
-    if (compositionFlgRef.current
-	|| ev.nativeEvent.isComposing
-	|| ev.nativeEvent.keyCode === 229)
-    {
-      if (ev.key === 'Enter')
-	ev.preventDefault ()
-      return
-    }
-
     switch (ev.key)
     {
     case 'ArrowDown':
@@ -118,12 +90,13 @@ const TagSearch: FC = () => {
       break
 
     case 'Enter':
+      if (activeIndex < 0)
+	break
+      ev.preventDefault ()
       {
-	const selected = suggestionsVsbl ? suggestions[activeIndex] : null
-	if (selected == null)
-	  break
-	ev.preventDefault ()
-	handleTagSelect (selected)
+	const selected = suggestions[activeIndex]
+	if (selected)
+	  handleTagSelect (selected)
       }
       break
 
@@ -132,6 +105,20 @@ const TagSearch: FC = () => {
       setSuggestionsVsbl (false)
       break
     }
+    if (ev.key === 'Enter' && (!(suggestionsVsbl) || activeIndex < 0))
+      {
+	const parts = search.split (' ')
+	const match = parts.map (t => t.toLowerCase ()).includes ('type:or') ? 'any' : 'all'
+	navigate (`/posts?${
+	    (new URLSearchParams ({
+		tags: parts.map (t => t.toLowerCase ())
+			   .filter (t => t !== 'type:or')
+			   .join (' '),
+		match }))
+	    .toString () }`)
+	setSuggestionsVsbl (false)
+	setRequest ({ query: '' })
+      }
   }
 
   const handleTagSelect = (tag: Tag) => {
@@ -157,9 +144,8 @@ const TagSearch: FC = () => {
   }, [location.search])
 
   return (
-      <form onSubmit={handleSubmit} className="relative w-full">
+      <div className="relative w-full">
 	<input type="text"
-	       enterKeyHint="search"
 	       data-shortcut-focus-search="true"
 	       placeholder={message ('labels.tagSearch').text}
 	       value={search}
@@ -167,18 +153,12 @@ const TagSearch: FC = () => {
 	       onFocus={() => setSuggestionsVsbl (true)}
 	       onBlur={() => setSuggestionsVsbl (false)}
 	       onKeyDown={handleKeyDown}
-	       onCompositionStart={() => {
-		 compositionFlgRef.current = true
-	       }}
-	       onCompositionEnd={() => {
-		 compositionFlgRef.current = false
-	       }}
 	       className={inputClass (false,
 				      'px-3 py-2 dark:border-gray-600 dark:bg-gray-800 dark:text-white')}/>
 	<TagSearchBox suggestions={suggestionsVsbl && suggestions.length ? suggestions : [] as Tag[]}
 		      activeIndex={activeIndex}
 		      onSelect={handleTagSelect}/>
-      </form>)
+      </div>)
 }
 
 export default TagSearch

frontend/src/components/common/ResourcePickerButton.tsx

@@ -1,27 +0,0 @@
-import CandidatePicker from '@/components/common/CandidatePicker'
-import { Button } from '@/components/ui/button'
-import useDialogue from '@/lib/dialogues/useDialogue'
-import { useUITranslation } from '@/lib/useUITranslation'
-
-import type { CandidateSource } from '@/components/common/CandidatePicker'
-
-
-const ResourcePickerButton = (
-    { source, values, maximum = 1, disabled, onSelect }: {
-	source: CandidateSource; values: (string | number | boolean)[]
-	maximum?: number; disabled?: boolean
-	onSelect: (values: string[]) => void },
-) => {
-  const dialogue = useDialogue ()
-  const { label } = useUITranslation ('counts')
-  return <Button type="button" variant="outline" disabled={disabled || maximum === 0}
-      onClick={() => void dialogue.form ({
-	  title: label ('pattern.link'), size: 'large', footerLayout: 'inline',
-	  body: controls => <CandidatePicker source={source} initial={values}
-	      maximum={maximum} controls={controls} onSelect={onSelect}/> })}>
-    {label ('pattern.selection')}
-  </Button>
-}
-
-
-export default ResourcePickerButton

frontend/src/components/counts/CountsAdditionalConditions.tsx

@@ -2,10 +2,9 @@ import { useEffect, useState } from 'react'
 
 import CountsConditionValues from '@/components/counts/CountsConditionValues'
 import DateTimeField from '@/components/common/DateTimeField'
-import ResourcePickerButton from '@/components/common/ResourcePickerButton'
 import { Button } from '@/components/ui/button'
-import { countsCandidateSource, countsConditionInputs, countsEventTypes, countsFieldLabel,
-	 countsFilterFields, countsSetOperators, useCountsDefinition }
+import { countsConditionInputs, countsEventTypes, countsFieldLabel, countsFilterFields,
+	 countsSetOperators, useCountsDefinition }
     from '@/lib/countsDefinitions'
 import useDialogue from '@/lib/dialogues/useDialogue'
 import { countsConditionValue } from '@/lib/countsDisplay'
@@ -16,7 +15,7 @@ import { useUITranslation } from '@/lib/useUITranslation'
 
 import { readCountState, encodeCountState } from '@/lib/queryState'
 
-import type { CountsResource, CountsResult } from '@/lib/counts'
+import type { CountsResult } from '@/lib/counts'
 import type { DialogueFormControls } from '@/lib/dialogues/useDialogue'
 import type { CountsCondition, CountsDefinition } from '@/lib/countsDefinitions'
 
@@ -95,12 +94,10 @@ const ConditionEditor = (
 }
 
 
-const CountsAdditionalConditions = (
-    { resource, params, update, conditionLabels }: {
-	resource: CountsResource
-	conditionLabels?: CountsResult['conditionLabels']
-	params: URLSearchParams
-	update: (key: string, value: string) => void },
+const CountsAdditionalConditions = ({ params, update, conditionLabels }: {
+    conditionLabels?: CountsResult['conditionLabels']
+    params: URLSearchParams
+    update: (key: string, value: string) => void },
 ) => {
   const { label, message } = useUITranslation ('counts')
   const definition = useCountsDefinition ()
@@ -152,19 +149,11 @@ const CountsAdditionalConditions = (
 	  value={condition[key] == null ? '' : String (condition[key])} disabled={condition.blank}
 	  aria-label={aria.text} lang={aria.language}
 	  onChange={value => patch (index, { [key]: value ?? '' })}/>
-    const source = countsCandidateSource (resource, condition.field, params)
-    const value = condition[key]
-    return <>
-      <input value={condition[key] == null ? '' : String (condition[key])}
-	  disabled={condition.blank}
-	  type={(type === 'integer' || type === 'interval') ? 'number' : 'text'}
-	  className={inputClass (false, 'h-10 w-36 min-w-0 max-w-full py-1')}
-	  aria-label={aria.text} lang={aria.language}
-	  onChange={event => patch (index, { [key]: event.target.value })}/>
-      {source != null && <ResourcePickerButton source={source} disabled={condition.blank}
-	  values={value == null ? [] : [value]}
-	  onSelect={values => patch (index, { [key]: values[0] ?? '' })}/>}
-    </>
+    return <input value={condition[key] == null ? '' : String (condition[key])} disabled={condition.blank}
+	type={(type === 'integer' || type === 'interval') ? 'number' : 'text'}
+	className={inputClass (false, 'h-10 w-36 min-w-0 max-w-full py-1')}
+	aria-label={aria.text} lang={aria.language}
+	onChange={event => patch (index, { [key]: event.target.value })}/>
   }
   return <fieldset className="min-w-0 space-y-1">
     <legend className="flex items-center gap-2">{label ('additionalConditions')}
@@ -193,7 +182,7 @@ const CountsAdditionalConditions = (
 	  </Button>
 	  {countsSetOperators.includes (condition.operator) ? (
 	      <CountsConditionValues key={`${condition.field}:${condition.operator}`}
-		  condition={condition} resource={resource}
+		  condition={condition}
 		  field={metadata.find (field => field.key === condition.field)!}
 		  definition={definition} params={params}
 		  maximum={Math.max (0, 100 - conditions.reduce ((sum, item, position) =>

frontend/src/components/counts/CountsCandidatePicker.tsx

@@ -10,19 +10,16 @@ import { useUITranslation } from '@/lib/useUITranslation'
 import { inputClass } from '@/lib/utils'
 
 import type { DialogueFormControls } from '@/lib/dialogues/useDialogue'
-import type { CountsResource } from '@/lib/counts'
-import type { CountsCandidate } from '@/lib/countsDefinitions'
+import type { CountsCandidate, CountsDefinition, CountsFieldMetadata }
+    from '@/lib/countsDefinitions'
 
 
-type CandidateSource = {
-    resource: CountsResource; field: string; params?: URLSearchParams }
-
-const CandidatePicker = (
-    { source, choices = [], categories = [], initial, maximum, controls, onSelect }: {
-	source?: CandidateSource; choices?: CountsCandidate[]
-	categories?: { value: string; label: string }[]
+const CountsCandidatePicker = (
+    { field, definition, params, initial, maximum, controls, save }: {
+	field: CountsFieldMetadata; params: URLSearchParams
+	definition: CountsDefinition
 	initial: (string | number | boolean)[]; maximum: number
-	controls: DialogueFormControls; onSelect: (values: string[]) => void },
+	controls: DialogueFormControls; save: (values: string[]) => void },
 ) => {
   const { label, message } = useUITranslation ('counts')
   const locale = useLocale ()
@@ -32,58 +29,49 @@ const CandidatePicker = (
   const [search, setSearch] = useState ('')
   const [category, setCategory] = useState ('')
   const [page, setPage] = useState (1)
-  const params = source?.params ?? new URLSearchParams ()
   const point = useRef (params.get ('execution_at'))
-  const resource = source?.resource ?? 'posts'
-  const request = new URLSearchParams ({
-      field: source?.field ?? '', query: search, page: String (page) })
+  const request = new URLSearchParams ({ field: field.key, query: search, page: String (page) })
   for (const key of ['timezone', 'at', 'execution_at'])
     if (params.has (key)) request.set (key, params.get (key)!)
   if (countsUseLatest (params)) request.delete ('at')
   if (category) request.set ('category', category)
-  const dynamic = source != null
+  const dynamic = field.candidateSource === 'tags'
   const { data, isFetching: fetching, isError: errorFlg } = useQuery ({
-      queryKey: countsKeys.candidates (resource, request.toString (), locale), enabled: dynamic,
+      queryKey: countsKeys.candidates (request.toString (), locale), enabled: dynamic,
       queryFn: ({ signal }) => {
 	const pinned = new URLSearchParams (request)
 	if (point.current != null) pinned.set ('execution_at', point.current)
-	return fetchCountsCandidates (resource, pinned, locale, signal)
-      }, retry: false, staleTime: 0, gcTime: 0 })
+	return fetchCountsCandidates (pinned, locale, signal)
+      }, retry: false })
   useEffect (() => {
     if (data != null) point.current = data.executionAt
   }, [data])
   useEffect (() => {
     controls.setActions ([{ label: label ('counts:pattern.selection'),
-	onSelect: () => onSelect ([...selected]) }])
-  }, [controls, label, onSelect, selected])
-  const rows = dynamic ? data?.rows ?? [] : choices.filter (row =>
+	onSelect: () => save ([...selected]) }])
+  }, [controls, label, save, selected])
+  const fixed: CountsCandidate[] = (field.choices ?? []).map (choice => ({
+      value: choice.value, name: message (choice.label).text }))
+  const rows = dynamic ? data?.rows ?? [] : fixed.filter (row =>
       row.name?.includes (search))
   const headings: Record<string, string> = {
       id: 'columns.resourceId', name: 'columns.name', category: 'common:categoryLabel',
       kind: 'columns.kind' }
-  const referenceFlg = ['tags', 'tags_json', 'tags.id', 'members'].includes (source?.field ?? '')
-  const available =
-      dynamic
-      ? (referenceFlg ? ['id', 'name', 'category', 'kind'] : ['id', 'name']) : ['name']
+  const available = dynamic ? ['id', 'name', 'category', 'kind'] : ['name']
   const visible = available.filter (column => columns.includes (column))
+  const categories = definition.filterFields?.find (field =>
+      field.candidateSource === 'categories')?.choices ?? []
   const cell = (row: CountsCandidate, column: string) => {
-    if (column === 'category')
-      return row.category == null ? '' : message (`common:categories.${row.category}`).text
-    if (column === 'kind')
-    {
-      const key = row.kind === 'group' ? 'resources.tag_groups' : `kinds.${row.kind}`
-      return row.kind == null ? '' : message (key).text
-    }
+    if (column === 'category') return row.category == null ? ''
+	: message (`common:categories.${row.category}`).text
+    if (column === 'kind') return row.kind == null ? '' : message (`kinds.${row.kind}`).text
     return column === 'id' ? row.id : row.name
   }
   return <div className="min-w-0 space-y-2">
     <div className="flex min-w-0 items-center gap-2">
       <input className={inputClass (false, 'h-9 min-w-0 flex-1')}
-	  aria-label={message ('common:search').text} value={draft} maxLength={1000}
-	  onChange={event => {
-	    const value = event.target.value
-	    if (new TextEncoder ().encode (value).length <= 1000) setDraft (value)
-	  }}
+	  aria-label={message ('common:search').text} value={draft}
+	  onChange={event => setDraft (event.target.value)}
 	  onKeyDown={event => {
 	    if (event.key !== 'Enter') return
 	    event.preventDefault ()
@@ -93,7 +81,7 @@ const CandidatePicker = (
       <Button type="button" onClick={() => { setSearch (draft); setPage (1) }}>
 	{label ('common:search')}</Button>
     </div>
-    {categories.length > 0 && <select className={inputClass (false, 'h-9 w-full')}
+    {dynamic && <select className={inputClass (false, 'h-9 w-full')}
 	aria-label={message ('common:categoryLabel').text} value={category}
 	onChange={event => { setCategory (event.target.value); setPage (1) }}>
       <option value=""/>
@@ -120,13 +108,12 @@ const CandidatePicker = (
 	  {visible.map (column => <th key={column} className="p-2">
 	    {label (headings[column])}</th>)}
 	</tr></thead>
-	<tbody>{rows.map (row => <tr key={`${row.kind ?? ''}:${row.value}`}
-	    className="border-t dark:border-slate-700">
+	<tbody>{rows.map (row => <tr key={row.value} className="border-t dark:border-slate-700">
 	  <td className="p-2"><input type="checkbox" checked={selected.has (row.value)}
 	      aria-label={row.name ?? String (row.id ?? '')}
-	      disabled={maximum !== 1 && !selected.has (row.value) && selected.size >= maximum}
+	      disabled={!selected.has (row.value) && selected.size >= maximum}
 	      onChange={event => setSelected (previous => {
-		const next = new Set (maximum === 1 ? [] : previous)
+		const next = new Set (previous)
 		if (event.target.checked) next.add (row.value)
 		else next.delete (row.value)
 		return next
@@ -141,8 +128,7 @@ const CandidatePicker = (
 	  onClick={() => setPage (previous => previous - 1)}>
 	{label ('common:pagination.previous')}</Button>
       <span>{page}</span>
-      <Button type="button" variant="outline"
-	  disabled={!data?.more || page >= 100_000 || fetching}
+      <Button type="button" variant="outline" disabled={!data?.more || fetching}
 	  onClick={() => setPage (previous => previous + 1)}>
 	{label ('common:pagination.next')}</Button>
     </div>}
@@ -150,5 +136,4 @@ const CandidatePicker = (
 }
 
 
-export default CandidatePicker
-export type { CandidateSource }
+export default CountsCandidatePicker

frontend/src/components/counts/CountsConditionValues.tsx

@@ -1,22 +1,18 @@
 import { useState } from 'react'
 
-import CandidatePicker from '@/components/common/CandidatePicker'
+import CountsCandidatePicker from '@/components/counts/CountsCandidatePicker'
 import DateTimeField from '@/components/common/DateTimeField'
-import ResourcePickerButton from '@/components/common/ResourcePickerButton'
 import { Button } from '@/components/ui/button'
-import { countsCandidateSource } from '@/lib/countsDefinitions'
 import useDialogue from '@/lib/dialogues/useDialogue'
 import { inputClass } from '@/lib/utils'
 import { useUITranslation } from '@/lib/useUITranslation'
 
-import type { CountsResource } from '@/lib/counts'
 import type { CountsCondition, CountsDefinition, CountsFieldMetadata }
     from '@/lib/countsDefinitions'
 
 
 const CountsConditionValues = (
-    { resource, condition, field, definition, params, maximum, change }: {
-	resource: CountsResource
+    { condition, field, definition, params, maximum, change }: {
 	condition: CountsCondition; field: CountsFieldMetadata; definition: CountsDefinition
 	params: URLSearchParams; maximum: number
 	change: (values: (string | number | boolean)[]) => void },
@@ -25,21 +21,11 @@ const CountsConditionValues = (
   const dialogue = useDialogue ()
   const [draft, setDraft] = useState ('')
   const values = condition.values ?? []
-  const source = countsCandidateSource (resource, field.key, params)
   const pick = () => {
     void dialogue.form ({ title: label (field.candidateSource === 'tags'
 	? 'counts:pattern.link' : 'counts:pattern.pattern'), size: 'large', footerLayout: 'inline',
-	body: controls => <CandidatePicker
-	    source={
-		field.candidateSource === 'tags'
-		? { resource: 'posts', field: field.key, params } : undefined}
-	    choices={(field.choices ?? []).map (choice => ({
-		value: choice.value, name: message (choice.label).text }))}
-	    categories={
-		field.candidateSource === 'tags'
-		? definition.filterFields?.find (field =>
-		    field.candidateSource === 'categories')?.choices : undefined}
-	    initial={values} maximum={maximum} controls={controls} onSelect={change}/> })
+	body: controls => <CountsCandidatePicker field={field} definition={definition}
+	    params={params} initial={values} maximum={maximum} controls={controls} save={change}/> })
   }
   if (condition.input === 'list' || field.candidateSource === 'tags')
     return <Button type="button" variant="outline" disabled={condition.blank} onClick={pick}>
@@ -87,8 +73,6 @@ const CountsConditionValues = (
 	  onClick={() => change (values.filter ((_, position) => position !== index))}>×</Button>
     </span>)}
     {input ()}
-    {source != null && <ResourcePickerButton source={source} values={values}
-	maximum={maximum} disabled={condition.blank} onSelect={change}/>}
     <Button type="button" variant="outline" disabled={condition.blank || draft === ''
 	|| values.length >= maximum} onClick={append}>{label ('add')}</Button>
     <Button type="button" variant="ghost" disabled={condition.blank}

frontend/src/components/counts/CountsControls.tsx

@@ -7,7 +7,6 @@ import AnimatedCollapse from '@/components/common/AnimatedCollapse'
 import DateTimeField from '@/components/common/DateTimeField'
 import FormField from '@/components/common/FormField'
 import HelpPopover from '@/components/common/HelpPopover'
-import ResourcePickerButton from '@/components/common/ResourcePickerButton'
 import TagInput from '@/components/common/TagInput'
 import { Button } from '@/components/ui/button'
 import { countsRequestParams, countsUseLatest, fieldsForCounts, normaliseCountsParams, readCountSort,
@@ -224,17 +223,11 @@ const CountsControls = (
             {['resource_id', 'user_id'].map (key => <FormField key={key}
                 label={label (key === 'resource_id' ? 'columns.resourceId'
                     : 'fields.actor')}>
-              {() => <div className="flex flex-wrap items-center gap-1">
-		<input value={draft.get (key) ?? ''}
-		    aria-label={message (key === 'resource_id' ? 'columns.resourceId'
-			: 'fields.actor').text}
-		    className={inputClass (false, 'w-28 py-1')}
-		    onChange={event => update (key, event.target.value)}/>
-		<ResourcePickerButton source={{ resource,
-		    field: key === 'resource_id' ? key : 'user', params: draft }}
-		    values={draft.get (key) ? [draft.get (key)!] : []}
-		    onSelect={values => update (key, values[0] ?? '')}/>
-	      </div>}
+              {() => <input value={draft.get (key) ?? ''}
+                  aria-label={message (key === 'resource_id' ? 'columns.resourceId'
+                      : 'fields.actor').text}
+                  className={inputClass (false, 'w-28 py-1')}
+                  onChange={event => update (key, event.target.value)}/>}
             </FormField>)}
           </div>
           {resource === 'posts' && <FormField label={label ('columns.tags')}>
@@ -270,7 +263,7 @@ const CountsControls = (
               </>}
             </div>}
           </FormField>}
-	  <CountsAdditionalConditions resource={resource} params={draft} update={update}
+	  <CountsAdditionalConditions params={draft} update={update}
               conditionLabels={(labelParams != null
                   && draft.get ('current') === labelParams.get ('current')
                   && draft.get ('at') === labelParams.get ('at')

frontend/src/components/dialogues/DialogueProvider.tsx

@@ -227,13 +227,11 @@ const DialogueProvider: FC<Props> = ({ children }) => {
 		       </DialogHeader>
 
 		       <div className="min-h-0 flex-1 overflow-y-auto overscroll-contain">
-			 <DialogueProvider key={active.id}>
-			   {active.options.body (
-			       formControls.current[active.id] ??= {
+			 {active.options.body (
+			     formControls.current[active.id] ??= {
 				 close: () => closeRequest (active.id),
 				 setActions: actions => setRequestActions (active.id, actions),
 				 confirm: options => openNestedConfirm (active.id, options) })}
-			 </DialogueProvider>
 		       </div>
 
 		       <DialogFooter

frontend/src/components/posts/PostCoreDataFields.tsx

@@ -1,4 +1,3 @@
-import ResourcePickerButton from '@/components/common/ResourcePickerButton'
 import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
 import PostTagsField from '@/components/posts/PostTagsField'
 import PostTextField from '@/components/posts/PostTextField'
@@ -89,12 +88,7 @@ const PostCoreDataFields: FC<PostCoreDataFieldsProps> = (
           disabled={parentPostIds.disabled}
           warnings={parentPostIds.warnings}
           errors={parentPostIds.errors}
-          onChange={parentPostIds.onChange}
-	  after={<ResourcePickerButton
-	      source={{ resource: 'posts', field: 'resource_id' }}
-	      values={parentPostIds.value.split (/\s+/).filter (Boolean)}
-	      maximum={Number.MAX_SAFE_INTEGER} disabled={parentPostIds.disabled}
-	      onSelect={values => parentPostIds.onChange (values.join (' '))}/>}/>
+          onChange={parentPostIds.onChange}/>
     </>)
 
 export default PostCoreDataFields

frontend/src/lib/countsDefinitions.ts

@@ -89,19 +89,18 @@ export const fetchCountsDefinition = (
     .then (definition => localiseCountsDefinition (definition, locale))
 
 export type CountsCandidate = {
-    value: string; id?: number | string; name: string | null; category?: string | null
+    value: string; id?: number; name: string | null; category?: string | null
     names?: Record<string, unknown>
-    kind?: 'internal' | 'external' | 'group' }
+    kind?: 'internal' | 'external' }
 export type CountsCandidatesResult = {
     rows: CountsCandidate[]; page: number; more: boolean; executionAt: string }
 
 export const fetchCountsCandidates = (
-    resource: CountsResource,
     params: URLSearchParams,
     locale: LocaleCode,
     signal?: AbortSignal,
 ): Promise<CountsCandidatesResult> => apiGet (
-    `/counts/definitions/${encodeURIComponent (resource)}/candidates`, {
+    '/counts/definitions/posts/candidates', {
 	params: Object.fromEntries (params), locale, signal })
 
 export const countsSetOperators = ['in', 'not_in', 'any', 'all', 'none']
@@ -156,25 +155,3 @@ export const countsAxisFields = (
     history: boolean,
 ): CountField[] => definition.axes[history ? 'history' : 'latest']
     .map (key => ({ key, label: countsFieldLabel (key) }))
-
-
-export const countsCandidateSource = (
-    resource: CountsResource,
-    field: string,
-    params: URLSearchParams,
-): { resource: CountsResource; field: string; params: URLSearchParams } | undefined => {
-  if (['resource_id', 'user', 'updated_by_user_id', 'file_blob_id', 'source_file_id']
-      .includes (field)) return { resource, field, params }
-  if (field === 'user.id') return { resource, field: 'user', params }
-  if ((field === 'tags.id' && resource === 'posts')
-      || (field === 'members' && resource === 'tag_groups'))
-    return { resource, field, params }
-  const leaf = field.split ('.').at (-1) ?? ''
-  const targets: Record<string, CountsResource> = {
-      tagGroupId: 'tag_groups', tagId: 'tags', tag_id: 'tags', parent_id: 'materials',
-      parents: resource === 'posts' ? 'posts' : 'tags',
-      'parents.id': resource === 'posts' ? 'posts' : 'tags',
-      parent_post_ids: 'posts', parent_tag_ids: 'tags' }
-  const target = targets[field] ?? targets[leaf]
-  return target == null ? undefined : { resource: target, field: 'resource_id', params }
-}

frontend/src/lib/queryKeys.ts

@@ -174,7 +174,6 @@ export const theatresKeys = {
 export const countsKeys = {
     definition: (resource: string, locale: LocaleCode = 'ja') =>
 	['counts', 'definition', resource, locale] as const,
-    candidates: (resource: string, params: string, locale: LocaleCode) =>
-	['counts', 'candidates', resource, locale, params] as const,
+    candidates: (params: string, locale: LocaleCode) => ['counts', 'candidates', locale, params] as const,
     index: (resource: string, params: string, locale: LocaleCode) =>
 	['counts', resource, locale, params] as const }

frontend/src/pages/materials/MaterialHistoryPage.tsx

@@ -6,7 +6,6 @@ import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
 import PrefetchLink from '@/components/PrefetchLink'
 import FormField from '@/components/common/FormField'
 import PageTitle from '@/components/common/PageTitle'
-import ResourcePickerButton from '@/components/common/ResourcePickerButton'
 import Pagination from '@/components/common/Pagination'
 import MainArea from '@/components/layout/MainArea'
 import PageHead from '@/components/common/PageHead'
@@ -97,19 +96,13 @@ const MaterialHistoryPage: FC = () => {
 	    <div className="space-y-3">
 	      <FormField label={label ('materialId')}>
 		{({ invalid }) => (
-		    <>
-		      <input
+		    <input
 			type="text"
 			value={materialIdInput}
 			aria-label={message ('materialId').text}
 			lang={message ('materialId').language}
 			onChange={e => setMaterialIdInput (e.target.value)}
-			className={inputClass (invalid)}/>
-		      <ResourcePickerButton
-			source={{ resource: 'materials', field: 'resource_id' }}
-			values={materialIdInput === '' ? [] : [materialIdInput]}
-			onSelect={values => setMaterialIdInput (values[0] ?? '')}/>
-		    </>)}
+			className={inputClass (invalid)}/>)}
 	      </FormField>
 
 	      <FormField label={label ('tagName')}>

frontend/src/pages/materials/MaterialSyncSuppressionsPage.tsx

@@ -4,7 +4,6 @@ import { useState } from 'react'
 import { useLocale } from '@/lib/useLocale'
 import FormField from '@/components/common/FormField'
 import PageTitle from '@/components/common/PageTitle'
-import ResourcePickerButton from '@/components/common/ResourcePickerButton'
 import MainArea from '@/components/layout/MainArea'
 import { Button } from '@/components/ui/button'
 import { toast } from '@/components/ui/use-toast'
@@ -127,17 +126,11 @@ const MaterialSyncSuppressionsPage: FC = () => {
 
 	      <FormField label={label ('suppressions.driveFileId')}>
 		{({ invalid }) => (
-		    <>
-		      <input
+		    <input
 			type="text"
 			value={driveFileId}
 			onChange={e => setDriveFileId (e.target.value)}
-			className={inputClass (invalid)}/>
-		      <ResourcePickerButton
-			source={{ resource: 'materials', field: 'drive_file_id' }}
-			values={driveFileId === '' ? [] : [driveFileId]}
-			onSelect={values => setDriveFileId (values[0] ?? '')}/>
-		    </>)}
+			className={inputClass (invalid)}/>)}
 	      </FormField>
 
 	      <FormField label={label ('suppressions.reason')}>