@rex0220/kintone-sql-tools 2.5.0 → 2.7.0

package/dist-cli/ksql.js

@@ -3581,10 +3581,12 @@ function typedInContains(leftStr, values, fieldType) {
     if (!Array.isArray(parsed) || !parsed.every((item) => typeof item === "string")) {
       return fallback();
     }
+    if (parsed.length === 0 && values.has("")) return true;
     return parsed.some((item) => values.has(item));
   }
   if (OBJECT_ARRAY_FIELD_TYPES.has(fieldType)) {
     if (!Array.isArray(parsed) || !parsed.every(hasStringCode)) return fallback();
+    if (parsed.length === 0 && values.has("")) return true;
     return parsed.some((item) => values.has(item.code));
   }
   if (!hasStringCode(parsed)) return fallback();
@@ -4197,8 +4199,11 @@ async function resolveDmlTargetIds(getRecords, app, query, options) {
 function extractSafePushdownLeaves(where, options = {}) {
   return extractAndLeaves(where, (expr) => isSafeComparison(expr, options));
 }
-function extractNumericPushdownCandidates(where, options = {}) {
-  return extractAndLeaves(where, (expr) => isNumericCandidate(expr, options));
+function extractTypedPushdownCandidates(where, options = {}) {
+  return extractAndLeaves(
+    where,
+    (expr) => isNumericCandidate(expr, options) || isSelectionInCandidate(expr, options)
+  );
 }
 function extractAndLeaves(where, accept) {
   switch (where.type) {
@@ -4222,8 +4227,28 @@ function extractAndLeaves(where, accept) {
 }
 function isSafeComparison(expr, options) {
   if (isSafeIdComparison(expr, options)) return true;
-  if (!isNumericCandidate(expr, options)) return false;
-  return options.fieldTypes?.get(expr.left.field) === "NUMBER";
+  if (isNumericCandidate(expr, options)) {
+    return options.fieldTypes?.get(expr.left.field) === "NUMBER";
+  }
+  return isSelectionInComparison(expr, options);
+}
+var SELECTION_IN_FIELD_TYPES = /* @__PURE__ */ new Set([
+  "DROP_DOWN",
+  "RADIO_BUTTON",
+  "CHECK_BOX",
+  "MULTI_SELECT",
+  "STATUS"
+]);
+function isSelectionInComparison(expr, options) {
+  if (!isSelectionInCandidate(expr, options)) return false;
+  if (expr.left.type !== "FIELD" || expr.right.type !== "IN_LIST") return false;
+  const fieldType = options.fieldTypes?.get(expr.left.field);
+  if (fieldType === void 0 || !SELECTION_IN_FIELD_TYPES.has(fieldType)) return false;
+  const validOptions = options.fieldOptions?.get(expr.left.field);
+  if (validOptions === void 0) return false;
+  return expr.right.values.every(
+    (value) => value.type === "STRING" && value.value !== "" && validOptions.has(value.value)
+  );
 }
 function isSafeIdComparison(expr, options) {
   if (!isTargetIdField(expr.left, options)) return false;
@@ -4243,6 +4268,13 @@ function isNumericCandidate(expr, options) {
   if (expr.op === "=") return true;
   return (expr.op === "<" || expr.op === ">") && Number.isSafeInteger(expr.right.value);
 }
+function isSelectionInCandidate(expr, options) {
+  if (expr.left.type !== "FIELD" || expr.left.field === "$id") return false;
+  if (!isTargetField(expr.left, options)) return false;
+  if (expr.op !== "IN" && expr.op !== "NOT_IN") return false;
+  if (expr.right.type !== "IN_LIST" || expr.right.values.length === 0) return false;
+  return expr.right.values.every((value) => value.type === "STRING" && value.value !== "");
+}
 function isTargetField(field, options) {
   const targetAlias = options.tableAlias ?? null;
   if (field.tableAlias === targetAlias) return true;
@@ -4254,7 +4286,7 @@ function flatten(record, alias) {
   const row = {};
   for (const [field, fv] of Object.entries(record)) {
     const val = fv.value;
-    const strVal = typeof val === "string" ? val : JSON.stringify(val ?? "");
+    const strVal = val == null ? "" : typeof val === "string" ? val : JSON.stringify(val);
     if (alias) {
       row[`${alias}.${field}`] = strVal;
       row[field] = strVal;
@@ -4856,6 +4888,7 @@ function createEmptyMetrics() {
     deleteCalls: 0,
     fieldCalls: 0,
     appsCalls: 0,
+    processStatusCalls: 0,
     fetchedRows: 0,
     elapsedMs: 0
   };
@@ -4887,6 +4920,10 @@ function wrapClientWithMetrics(client, metrics) {
     getFields: (appId) => {
       metrics.fieldCalls += 1;
       return client.getFields(appId);
+    },
+    getProcessStatuses: (appId) => {
+      metrics.processStatusCalls += 1;
+      return client.getProcessStatuses(appId);
     }
   };
 }
@@ -5464,43 +5501,88 @@ async function validateSelectFieldCodes(stmt, mode, client, cacheContext) {
     }
   }
 }
-function extractMainSafePushdown(stmt, fieldTypes) {
+function extractMainSafePushdown(stmt, fieldTypes, fieldOptions) {
   if (stmt.where === null || stmt.from.subtableCode || stmt.from.cteName !== null) return null;
   if (stmt.joins.length === 0) {
     return extractSafePushdownLeaves(stmt.where, {
       tableAlias: stmt.from.alias ?? void 0,
       allowUnqualifiedFields: true,
-      fieldTypes
+      fieldTypes,
+      fieldOptions
     });
   }
   if (!stmt.from.alias) return null;
-  return extractSafePushdownLeaves(stmt.where, { tableAlias: stmt.from.alias, fieldTypes });
+  return extractSafePushdownLeaves(stmt.where, {
+    tableAlias: stmt.from.alias,
+    fieldTypes,
+    fieldOptions
+  });
 }
-function extractMainNumericPushdownCandidate(stmt) {
+function extractMainTypedPushdownCandidate(stmt) {
   if (stmt.where === null || stmt.from.subtableCode || stmt.from.cteName !== null) return null;
   if (stmt.joins.length === 0) {
-    return extractNumericPushdownCandidates(stmt.where, {
+    return extractTypedPushdownCandidates(stmt.where, {
       tableAlias: stmt.from.alias ?? void 0,
       allowUnqualifiedFields: true
     });
   }
   if (!stmt.from.alias) return null;
-  return extractNumericPushdownCandidates(stmt.where, { tableAlias: stmt.from.alias });
-}
-async function loadNumericPushdownFieldTypes(stmt, client, cacheContext) {
-  const appIds = /* @__PURE__ */ new Set();
-  if (extractMainNumericPushdownCandidate(stmt) !== null) appIds.add(stmt.from.appId);
+  return extractTypedPushdownCandidates(stmt.where, { tableAlias: stmt.from.alias });
+}
+async function loadTypedPushdownMeta(stmt, client, cacheContext) {
+  const candidatesByApp = /* @__PURE__ */ new Map();
+  const addCandidate = (appId, candidate) => {
+    if (candidate === null) return;
+    const existing = candidatesByApp.get(appId);
+    if (existing) existing.push(candidate);
+    else candidatesByApp.set(appId, [candidate]);
+  };
+  addCandidate(stmt.from.appId, extractMainTypedPushdownCandidate(stmt));
   if (stmt.where !== null) {
     for (const join2 of stmt.joins) {
       if (!join2.table.alias || join2.table.subtableCode || join2.table.cteName !== null) continue;
-      const candidate = extractNumericPushdownCandidates(stmt.where, {
+      const candidate = extractTypedPushdownCandidates(stmt.where, {
         tableAlias: join2.table.alias
       });
-      if (candidate !== null) appIds.add(join2.table.appId);
+      addCandidate(join2.table.appId, candidate);
     }
   }
-  const entries = await Promise.all([...appIds].map(async (appId) => [appId, await getFieldTypeMap(appId, client, cacheContext)]));
-  return new Map(entries);
+  const entries = await Promise.all([...candidatesByApp.entries()].map(async ([appId, candidates]) => {
+    const [fieldTypes, fieldOptions] = await Promise.all([
+      getFieldTypeMap(appId, client, cacheContext),
+      getFieldOptionSetMapByApp(appId, client, cacheContext)
+    ]);
+    const statusFields = collectCandidateFieldCodes(candidates).filter((fieldCode) => fieldTypes.get(fieldCode) === "STATUS");
+    if (statusFields.length > 0) {
+      const process2 = await getProcessStatusesCached(appId, client, cacheContext);
+      if (process2.enable && process2.states.length > 0) {
+        const states = new Set(process2.states);
+        for (const fieldCode of statusFields) fieldOptions.set(fieldCode, states);
+      }
+    }
+    return [appId, fieldTypes, fieldOptions];
+  }));
+  return {
+    fieldTypesByApp: new Map(entries.map(([appId, fieldTypes]) => [appId, fieldTypes])),
+    fieldOptionsByApp: new Map(entries.map(([appId, , fieldOptions]) => [appId, fieldOptions]))
+  };
+}
+function collectCandidateFieldCodes(candidates) {
+  const fields = /* @__PURE__ */ new Set();
+  const visit = (expr) => {
+    if (expr.type === "BINARY") {
+      if (expr.left.type === "FIELD") fields.add(expr.left.field);
+      return;
+    }
+    if (expr.type === "LOGICAL") {
+      visit(expr.left);
+      visit(expr.right);
+      return;
+    }
+    if (expr.type === "GROUP" || expr.type === "NOT") visit(expr.expr);
+  };
+  for (const candidate of candidates) visit(candidate);
+  return [...fields];
 }
 function collectTypedInFieldRefs(expr, out) {
   if (expr === null) return;
@@ -5612,14 +5694,15 @@ async function executeFullScanSelect(stmt, client, options, cacheContext, cteCac
     resolveSubqueries(stmt.where, client, options, cacheContext, cteCache),
     resolveSubqueries(stmt.having, client, options, cacheContext, cteCache)
   ]);
-  const [pushdownFieldTypes, typedInFieldTypes] = await Promise.all([
-    loadNumericPushdownFieldTypes(stmt, client, cacheContext),
+  const [pushdownMeta, typedInFieldTypes] = await Promise.all([
+    loadTypedPushdownMeta(stmt, client, cacheContext),
     loadTypedInFieldTypes(stmt, client, cacheContext)
   ]);
   const fieldTypeResolvers = buildSelectFieldTypeResolvers(stmt, typedInFieldTypes);
   const mainPushDown = extractMainSafePushdown(
     stmt,
-    pushdownFieldTypes.get(stmt.from.appId)
+    pushdownMeta.fieldTypesByApp.get(stmt.from.appId),
+    pushdownMeta.fieldOptionsByApp.get(stmt.from.appId)
   );
   const tableConditions = /* @__PURE__ */ new Map();
   if (stmt.where !== null) {
@@ -5627,7 +5710,8 @@ async function executeFullScanSelect(stmt, client, options, cacheContext, cteCac
       if (!join2.table.alias || join2.table.subtableCode || join2.table.cteName !== null) continue;
       const cond = extractSafePushdownLeaves(stmt.where, {
         tableAlias: join2.table.alias,
-        fieldTypes: pushdownFieldTypes.get(join2.table.appId)
+        fieldTypes: pushdownMeta.fieldTypesByApp.get(join2.table.appId),
+        fieldOptions: pushdownMeta.fieldOptionsByApp.get(join2.table.appId)
       });
       if (cond) tableConditions.set(join2.table.alias, cond);
     }
@@ -6125,6 +6209,7 @@ var fieldTypeCache = /* @__PURE__ */ new Map();
 var optionOrderCache = /* @__PURE__ */ new Map();
 var sortKindCache = /* @__PURE__ */ new Map();
 var fieldInfoCache = /* @__PURE__ */ new Map();
+var processStatusCache = /* @__PURE__ */ new Map();
 function getScopedCacheValue(root, cacheContext, appId) {
   return root.get(cacheContext)?.get(appId);
 }
@@ -6146,6 +6231,13 @@ async function getFieldsCached(appId, client, cacheContext) {
   setScopedCacheValue(fieldInfoCache, cacheContext, appId, loading);
   return loading;
 }
+async function getProcessStatusesCached(appId, client, cacheContext) {
+  const cached = getScopedCacheValue(processStatusCache, cacheContext, appId);
+  if (cached) return cached;
+  const loading = client.getProcessStatuses(appId);
+  setScopedCacheValue(processStatusCache, cacheContext, appId, loading);
+  return loading;
+}
 async function getFieldTypeMap(appId, client, cacheContext) {
   const cached = getScopedCacheValue(fieldTypeCache, cacheContext, appId);
   if (cached) return cached;
@@ -6168,6 +6260,15 @@ async function getOptionOrderMapByApp(appId, client, cacheContext) {
   setScopedCacheValue(optionOrderCache, cacheContext, appId, map);
   return map;
 }
+async function getFieldOptionSetMapByApp(appId, client, cacheContext) {
+  const optionOrders = await getOptionOrderMapByApp(appId, client, cacheContext);
+  return new Map(
+    [...optionOrders.entries()].map(([fieldCode, order]) => [
+      fieldCode,
+      new Set(order.keys())
+    ])
+  );
+}
 async function getSortKindMapByApp(appId, client, cacheContext) {
   const cached = getScopedCacheValue(sortKindCache, cacheContext, appId);
   if (cached) return cached;
@@ -7127,12 +7228,12 @@ function buildSelectPlan(stmt, label) {
     const mainFields = selectToFetchAllFields(stmt, stmt.from);
     const mainAliasStr = stmt.from.alias ? ` AS ${stmt.from.alias}` : "";
     const mainPushDown = extractMainSafePushdown(stmt);
-    const mainCandidate = extractMainNumericPushdownCandidate(stmt);
+    const mainCandidate = extractMainTypedPushdownCandidate(stmt);
     const mainQ = mainPushDown !== null ? whereToKintone(mainPushDown) : "(\u5168\u4EF6\u53D6\u5F97)";
     lines.push(`  app:           APP${stmt.from.appId}${mainAliasStr} (${stmt.from.appId})`);
     lines.push(`  kintone query: ${mainQ}`);
     if (mainCandidate !== null) {
-      lines.push(`  pushdown candidate: ${whereToKintone(mainCandidate)}\uFF08\u5B9F\u884C\u6642\u306E\u578B\u78BA\u8A8D\u5F85\u3061\uFF09`);
+      lines.push(`  pushdown candidate: ${whereToKintone(mainCandidate)}\uFF08\u5B9F\u884C\u6642\u306E\u578B\u30FB\u5B9F\u5728\u78BA\u8A8D\u5F85\u3061\uFF09`);
     }
     lines.push(`  fields:        ${mainFields.length === 0 ? "(\u5168\u30D5\u30A3\u30FC\u30EB\u30C9)" : mainFields.join(", ")}`);
     for (const join2 of stmt.joins) {
@@ -7140,12 +7241,12 @@ function buildSelectPlan(stmt, label) {
       const joinAliasStr = join2.table.alias ? ` AS ${join2.table.alias}` : "";
       const joinType = join2.type === "INNER" ? "JOIN" : `${join2.type} JOIN`;
       const joinPushDown = join2.table.alias && !join2.table.subtableCode && join2.table.cteName === null && stmt.where ? extractSafePushdownLeaves(stmt.where, { tableAlias: join2.table.alias }) : null;
-      const joinCandidate = join2.table.alias && !join2.table.subtableCode && join2.table.cteName === null && stmt.where ? extractNumericPushdownCandidates(stmt.where, { tableAlias: join2.table.alias }) : null;
+      const joinCandidate = join2.table.alias && !join2.table.subtableCode && join2.table.cteName === null && stmt.where ? extractTypedPushdownCandidates(stmt.where, { tableAlias: join2.table.alias }) : null;
       const joinQ = joinPushDown !== null ? whereToKintone(joinPushDown) : "(\u5168\u4EF6\u53D6\u5F97)";
       lines.push(`  ${joinType}:        APP${join2.table.appId}${joinAliasStr} (${join2.table.appId})`);
       lines.push(`  kintone query: ${joinQ}`);
       if (joinCandidate !== null) {
-        lines.push(`  pushdown candidate: ${whereToKintone(joinCandidate)}\uFF08\u5B9F\u884C\u6642\u306E\u578B\u78BA\u8A8D\u5F85\u3061\uFF09`);
+        lines.push(`  pushdown candidate: ${whereToKintone(joinCandidate)}\uFF08\u5B9F\u884C\u6642\u306E\u578B\u30FB\u5B9F\u5728\u78BA\u8A8D\u5F85\u3061\uFF09`);
       }
       lines.push(`  fields:        ${joinFields.length === 0 ? "(\u5168\u30D5\u30A3\u30FC\u30EB\u30C9)" : joinFields.join(", ")}`);
     }
@@ -7805,6 +7906,7 @@ function withRequestGate(client, gate) {
     getRecords: (params) => gate.runReadOnly(() => client.getRecords(params)),
     getApps: () => gate.runReadOnly(() => client.getApps()),
     getFields: (appId) => gate.runReadOnly(() => client.getFields(appId)),
+    getProcessStatuses: (appId) => gate.runReadOnly(() => client.getProcessStatuses(appId)),
     postRecords: (params) => gate.runMutation(() => client.postRecords(params)),
     putRecords: (params) => gate.runMutation(() => client.putRecords(params)),
     deleteRecords: (params) => gate.runMutation(() => client.deleteRecords(params))
@@ -8039,6 +8141,16 @@ function createNodeKintoneClient(baseUrl, tokenResolver) {
         appId
       );
       return flattenFormFieldProperties(res.properties);
+    },
+    async getProcessStatuses(appId) {
+      const qs = new URLSearchParams();
+      qs.set("app", String(appId));
+      qs.set("lang", "user");
+      const res = await requestJson(`${apiBasePath}/app/status.json?${qs.toString()}`, { method: "GET" }, appId);
+      return {
+        enable: res.enable,
+        states: Object.values(res.states ?? {}).map((state) => state.name)
+      };
     }
   };
 }
@@ -9126,7 +9238,10 @@ function createDryRunClient() {
     putRecords: notUsed,
     deleteRecords: notUsed,
     getApps: notUsed,
-    getFields: notUsed
+    getFields: notUsed,
+    async getProcessStatuses() {
+      return { enable: false, states: [] };
+    }
   };
 }
 async function runDiagnosticRecordGet(params) {
@@ -10143,6 +10258,13 @@ async function run() {
         if (!routed) throw new Error(`AuthError: profile "${pName}" is not resolved for APP${appId}.`);
         return routed.getFields(binding.appId);
       },
+      getProcessStatuses: (appId) => {
+        const binding = appBindingByMappedApp.get(appId) ?? { appId, profile: profileName.toLowerCase() };
+        const pName = binding.profile;
+        const routed = profileClientMap.get(pName);
+        if (!routed) throw new Error(`AuthError: profile "${pName}" is not resolved for APP${appId}.`);
+        return routed.getProcessStatuses(binding.appId);
+      },
       getApps: () => defaultClient.getApps()
     };
   }

package/dist-mcp/ksql-mcp.js

@@ -34482,10 +34482,12 @@ function typedInContains(leftStr, values, fieldType) {
     if (!Array.isArray(parsed) || !parsed.every((item) => typeof item === "string")) {
       return fallback();
     }
+    if (parsed.length === 0 && values.has("")) return true;
     return parsed.some((item) => values.has(item));
   }
   if (OBJECT_ARRAY_FIELD_TYPES.has(fieldType)) {
     if (!Array.isArray(parsed) || !parsed.every(hasStringCode)) return fallback();
+    if (parsed.length === 0 && values.has("")) return true;
     return parsed.some((item) => values.has(item.code));
   }
   if (!hasStringCode(parsed)) return fallback();
@@ -35098,8 +35100,11 @@ async function resolveDmlTargetIds(getRecords, app, query, options) {
 function extractSafePushdownLeaves(where, options = {}) {
   return extractAndLeaves(where, (expr) => isSafeComparison(expr, options));
 }
-function extractNumericPushdownCandidates(where, options = {}) {
-  return extractAndLeaves(where, (expr) => isNumericCandidate(expr, options));
+function extractTypedPushdownCandidates(where, options = {}) {
+  return extractAndLeaves(
+    where,
+    (expr) => isNumericCandidate(expr, options) || isSelectionInCandidate(expr, options)
+  );
 }
 function extractAndLeaves(where, accept) {
   switch (where.type) {
@@ -35123,8 +35128,28 @@ function extractAndLeaves(where, accept) {
 }
 function isSafeComparison(expr, options) {
   if (isSafeIdComparison(expr, options)) return true;
-  if (!isNumericCandidate(expr, options)) return false;
-  return options.fieldTypes?.get(expr.left.field) === "NUMBER";
+  if (isNumericCandidate(expr, options)) {
+    return options.fieldTypes?.get(expr.left.field) === "NUMBER";
+  }
+  return isSelectionInComparison(expr, options);
+}
+var SELECTION_IN_FIELD_TYPES = /* @__PURE__ */ new Set([
+  "DROP_DOWN",
+  "RADIO_BUTTON",
+  "CHECK_BOX",
+  "MULTI_SELECT",
+  "STATUS"
+]);
+function isSelectionInComparison(expr, options) {
+  if (!isSelectionInCandidate(expr, options)) return false;
+  if (expr.left.type !== "FIELD" || expr.right.type !== "IN_LIST") return false;
+  const fieldType = options.fieldTypes?.get(expr.left.field);
+  if (fieldType === void 0 || !SELECTION_IN_FIELD_TYPES.has(fieldType)) return false;
+  const validOptions = options.fieldOptions?.get(expr.left.field);
+  if (validOptions === void 0) return false;
+  return expr.right.values.every(
+    (value) => value.type === "STRING" && value.value !== "" && validOptions.has(value.value)
+  );
 }
 function isSafeIdComparison(expr, options) {
   if (!isTargetIdField(expr.left, options)) return false;
@@ -35144,6 +35169,13 @@ function isNumericCandidate(expr, options) {
   if (expr.op === "=") return true;
   return (expr.op === "<" || expr.op === ">") && Number.isSafeInteger(expr.right.value);
 }
+function isSelectionInCandidate(expr, options) {
+  if (expr.left.type !== "FIELD" || expr.left.field === "$id") return false;
+  if (!isTargetField(expr.left, options)) return false;
+  if (expr.op !== "IN" && expr.op !== "NOT_IN") return false;
+  if (expr.right.type !== "IN_LIST" || expr.right.values.length === 0) return false;
+  return expr.right.values.every((value) => value.type === "STRING" && value.value !== "");
+}
 function isTargetField(field, options) {
   const targetAlias = options.tableAlias ?? null;
   if (field.tableAlias === targetAlias) return true;
@@ -35155,7 +35187,7 @@ function flatten(record2, alias) {
   const row = {};
   for (const [field, fv] of Object.entries(record2)) {
     const val = fv.value;
-    const strVal = typeof val === "string" ? val : JSON.stringify(val ?? "");
+    const strVal = val == null ? "" : typeof val === "string" ? val : JSON.stringify(val);
     if (alias) {
       row[`${alias}.${field}`] = strVal;
       row[field] = strVal;
@@ -35757,6 +35789,7 @@ function createEmptyMetrics() {
     deleteCalls: 0,
     fieldCalls: 0,
     appsCalls: 0,
+    processStatusCalls: 0,
     fetchedRows: 0,
     elapsedMs: 0
   };
@@ -35788,6 +35821,10 @@ function wrapClientWithMetrics(client, metrics) {
     getFields: (appId) => {
       metrics.fieldCalls += 1;
       return client.getFields(appId);
+    },
+    getProcessStatuses: (appId) => {
+      metrics.processStatusCalls += 1;
+      return client.getProcessStatuses(appId);
     }
   };
 }
@@ -36365,43 +36402,88 @@ async function validateSelectFieldCodes(stmt, mode, client, cacheContext) {
     }
   }
 }
-function extractMainSafePushdown(stmt, fieldTypes) {
+function extractMainSafePushdown(stmt, fieldTypes, fieldOptions) {
   if (stmt.where === null || stmt.from.subtableCode || stmt.from.cteName !== null) return null;
   if (stmt.joins.length === 0) {
     return extractSafePushdownLeaves(stmt.where, {
       tableAlias: stmt.from.alias ?? void 0,
       allowUnqualifiedFields: true,
-      fieldTypes
+      fieldTypes,
+      fieldOptions
     });
   }
   if (!stmt.from.alias) return null;
-  return extractSafePushdownLeaves(stmt.where, { tableAlias: stmt.from.alias, fieldTypes });
+  return extractSafePushdownLeaves(stmt.where, {
+    tableAlias: stmt.from.alias,
+    fieldTypes,
+    fieldOptions
+  });
 }
-function extractMainNumericPushdownCandidate(stmt) {
+function extractMainTypedPushdownCandidate(stmt) {
   if (stmt.where === null || stmt.from.subtableCode || stmt.from.cteName !== null) return null;
   if (stmt.joins.length === 0) {
-    return extractNumericPushdownCandidates(stmt.where, {
+    return extractTypedPushdownCandidates(stmt.where, {
       tableAlias: stmt.from.alias ?? void 0,
       allowUnqualifiedFields: true
     });
   }
   if (!stmt.from.alias) return null;
-  return extractNumericPushdownCandidates(stmt.where, { tableAlias: stmt.from.alias });
+  return extractTypedPushdownCandidates(stmt.where, { tableAlias: stmt.from.alias });
 }
-async function loadNumericPushdownFieldTypes(stmt, client, cacheContext) {
-  const appIds = /* @__PURE__ */ new Set();
-  if (extractMainNumericPushdownCandidate(stmt) !== null) appIds.add(stmt.from.appId);
+async function loadTypedPushdownMeta(stmt, client, cacheContext) {
+  const candidatesByApp = /* @__PURE__ */ new Map();
+  const addCandidate = (appId, candidate) => {
+    if (candidate === null) return;
+    const existing = candidatesByApp.get(appId);
+    if (existing) existing.push(candidate);
+    else candidatesByApp.set(appId, [candidate]);
+  };
+  addCandidate(stmt.from.appId, extractMainTypedPushdownCandidate(stmt));
   if (stmt.where !== null) {
     for (const join of stmt.joins) {
       if (!join.table.alias || join.table.subtableCode || join.table.cteName !== null) continue;
-      const candidate = extractNumericPushdownCandidates(stmt.where, {
+      const candidate = extractTypedPushdownCandidates(stmt.where, {
         tableAlias: join.table.alias
       });
-      if (candidate !== null) appIds.add(join.table.appId);
+      addCandidate(join.table.appId, candidate);
     }
   }
-  const entries = await Promise.all([...appIds].map(async (appId) => [appId, await getFieldTypeMap(appId, client, cacheContext)]));
-  return new Map(entries);
+  const entries = await Promise.all([...candidatesByApp.entries()].map(async ([appId, candidates]) => {
+    const [fieldTypes, fieldOptions] = await Promise.all([
+      getFieldTypeMap(appId, client, cacheContext),
+      getFieldOptionSetMapByApp(appId, client, cacheContext)
+    ]);
+    const statusFields = collectCandidateFieldCodes(candidates).filter((fieldCode) => fieldTypes.get(fieldCode) === "STATUS");
+    if (statusFields.length > 0) {
+      const process4 = await getProcessStatusesCached(appId, client, cacheContext);
+      if (process4.enable && process4.states.length > 0) {
+        const states = new Set(process4.states);
+        for (const fieldCode of statusFields) fieldOptions.set(fieldCode, states);
+      }
+    }
+    return [appId, fieldTypes, fieldOptions];
+  }));
+  return {
+    fieldTypesByApp: new Map(entries.map(([appId, fieldTypes]) => [appId, fieldTypes])),
+    fieldOptionsByApp: new Map(entries.map(([appId, , fieldOptions]) => [appId, fieldOptions]))
+  };
+}
+function collectCandidateFieldCodes(candidates) {
+  const fields = /* @__PURE__ */ new Set();
+  const visit = (expr) => {
+    if (expr.type === "BINARY") {
+      if (expr.left.type === "FIELD") fields.add(expr.left.field);
+      return;
+    }
+    if (expr.type === "LOGICAL") {
+      visit(expr.left);
+      visit(expr.right);
+      return;
+    }
+    if (expr.type === "GROUP" || expr.type === "NOT") visit(expr.expr);
+  };
+  for (const candidate of candidates) visit(candidate);
+  return [...fields];
 }
 function collectTypedInFieldRefs(expr, out) {
   if (expr === null) return;
@@ -36513,14 +36595,15 @@ async function executeFullScanSelect(stmt, client, options, cacheContext, cteCac
     resolveSubqueries(stmt.where, client, options, cacheContext, cteCache),
     resolveSubqueries(stmt.having, client, options, cacheContext, cteCache)
   ]);
-  const [pushdownFieldTypes, typedInFieldTypes] = await Promise.all([
-    loadNumericPushdownFieldTypes(stmt, client, cacheContext),
+  const [pushdownMeta, typedInFieldTypes] = await Promise.all([
+    loadTypedPushdownMeta(stmt, client, cacheContext),
     loadTypedInFieldTypes(stmt, client, cacheContext)
   ]);
   const fieldTypeResolvers = buildSelectFieldTypeResolvers(stmt, typedInFieldTypes);
   const mainPushDown = extractMainSafePushdown(
     stmt,
-    pushdownFieldTypes.get(stmt.from.appId)
+    pushdownMeta.fieldTypesByApp.get(stmt.from.appId),
+    pushdownMeta.fieldOptionsByApp.get(stmt.from.appId)
   );
   const tableConditions = /* @__PURE__ */ new Map();
   if (stmt.where !== null) {
@@ -36528,7 +36611,8 @@ async function executeFullScanSelect(stmt, client, options, cacheContext, cteCac
       if (!join.table.alias || join.table.subtableCode || join.table.cteName !== null) continue;
       const cond = extractSafePushdownLeaves(stmt.where, {
         tableAlias: join.table.alias,
-        fieldTypes: pushdownFieldTypes.get(join.table.appId)
+        fieldTypes: pushdownMeta.fieldTypesByApp.get(join.table.appId),
+        fieldOptions: pushdownMeta.fieldOptionsByApp.get(join.table.appId)
       });
       if (cond) tableConditions.set(join.table.alias, cond);
     }
@@ -37026,6 +37110,7 @@ var fieldTypeCache = /* @__PURE__ */ new Map();
 var optionOrderCache = /* @__PURE__ */ new Map();
 var sortKindCache = /* @__PURE__ */ new Map();
 var fieldInfoCache = /* @__PURE__ */ new Map();
+var processStatusCache = /* @__PURE__ */ new Map();
 function getScopedCacheValue(root, cacheContext, appId) {
   return root.get(cacheContext)?.get(appId);
 }
@@ -37047,6 +37132,13 @@ async function getFieldsCached(appId, client, cacheContext) {
   setScopedCacheValue(fieldInfoCache, cacheContext, appId, loading);
   return loading;
 }
+async function getProcessStatusesCached(appId, client, cacheContext) {
+  const cached2 = getScopedCacheValue(processStatusCache, cacheContext, appId);
+  if (cached2) return cached2;
+  const loading = client.getProcessStatuses(appId);
+  setScopedCacheValue(processStatusCache, cacheContext, appId, loading);
+  return loading;
+}
 async function getFieldTypeMap(appId, client, cacheContext) {
   const cached2 = getScopedCacheValue(fieldTypeCache, cacheContext, appId);
   if (cached2) return cached2;
@@ -37069,6 +37161,15 @@ async function getOptionOrderMapByApp(appId, client, cacheContext) {
   setScopedCacheValue(optionOrderCache, cacheContext, appId, map2);
   return map2;
 }
+async function getFieldOptionSetMapByApp(appId, client, cacheContext) {
+  const optionOrders = await getOptionOrderMapByApp(appId, client, cacheContext);
+  return new Map(
+    [...optionOrders.entries()].map(([fieldCode, order]) => [
+      fieldCode,
+      new Set(order.keys())
+    ])
+  );
+}
 async function getSortKindMapByApp(appId, client, cacheContext) {
   const cached2 = getScopedCacheValue(sortKindCache, cacheContext, appId);
   if (cached2) return cached2;
@@ -38028,12 +38129,12 @@ function buildSelectPlan(stmt, label) {
     const mainFields = selectToFetchAllFields(stmt, stmt.from);
     const mainAliasStr = stmt.from.alias ? ` AS ${stmt.from.alias}` : "";
     const mainPushDown = extractMainSafePushdown(stmt);
-    const mainCandidate = extractMainNumericPushdownCandidate(stmt);
+    const mainCandidate = extractMainTypedPushdownCandidate(stmt);
     const mainQ = mainPushDown !== null ? whereToKintone(mainPushDown) : "(\u5168\u4EF6\u53D6\u5F97)";
     lines.push(`  app:           APP${stmt.from.appId}${mainAliasStr} (${stmt.from.appId})`);
     lines.push(`  kintone query: ${mainQ}`);
     if (mainCandidate !== null) {
-      lines.push(`  pushdown candidate: ${whereToKintone(mainCandidate)}\uFF08\u5B9F\u884C\u6642\u306E\u578B\u78BA\u8A8D\u5F85\u3061\uFF09`);
+      lines.push(`  pushdown candidate: ${whereToKintone(mainCandidate)}\uFF08\u5B9F\u884C\u6642\u306E\u578B\u30FB\u5B9F\u5728\u78BA\u8A8D\u5F85\u3061\uFF09`);
     }
     lines.push(`  fields:        ${mainFields.length === 0 ? "(\u5168\u30D5\u30A3\u30FC\u30EB\u30C9)" : mainFields.join(", ")}`);
     for (const join of stmt.joins) {
@@ -38041,12 +38142,12 @@ function buildSelectPlan(stmt, label) {
       const joinAliasStr = join.table.alias ? ` AS ${join.table.alias}` : "";
       const joinType = join.type === "INNER" ? "JOIN" : `${join.type} JOIN`;
       const joinPushDown = join.table.alias && !join.table.subtableCode && join.table.cteName === null && stmt.where ? extractSafePushdownLeaves(stmt.where, { tableAlias: join.table.alias }) : null;
-      const joinCandidate = join.table.alias && !join.table.subtableCode && join.table.cteName === null && stmt.where ? extractNumericPushdownCandidates(stmt.where, { tableAlias: join.table.alias }) : null;
+      const joinCandidate = join.table.alias && !join.table.subtableCode && join.table.cteName === null && stmt.where ? extractTypedPushdownCandidates(stmt.where, { tableAlias: join.table.alias }) : null;
       const joinQ = joinPushDown !== null ? whereToKintone(joinPushDown) : "(\u5168\u4EF6\u53D6\u5F97)";
       lines.push(`  ${joinType}:        APP${join.table.appId}${joinAliasStr} (${join.table.appId})`);
       lines.push(`  kintone query: ${joinQ}`);
       if (joinCandidate !== null) {
-        lines.push(`  pushdown candidate: ${whereToKintone(joinCandidate)}\uFF08\u5B9F\u884C\u6642\u306E\u578B\u78BA\u8A8D\u5F85\u3061\uFF09`);
+        lines.push(`  pushdown candidate: ${whereToKintone(joinCandidate)}\uFF08\u5B9F\u884C\u6642\u306E\u578B\u30FB\u5B9F\u5728\u78BA\u8A8D\u5F85\u3061\uFF09`);
       }
       lines.push(`  fields:        ${joinFields.length === 0 ? "(\u5168\u30D5\u30A3\u30FC\u30EB\u30C9)" : joinFields.join(", ")}`);
     }
@@ -38699,6 +38800,7 @@ function withRequestGate(client, gate) {
     getRecords: (params) => gate.runReadOnly(() => client.getRecords(params)),
     getApps: () => gate.runReadOnly(() => client.getApps()),
     getFields: (appId) => gate.runReadOnly(() => client.getFields(appId)),
+    getProcessStatuses: (appId) => gate.runReadOnly(() => client.getProcessStatuses(appId)),
     postRecords: (params) => gate.runMutation(() => client.postRecords(params)),
     putRecords: (params) => gate.runMutation(() => client.putRecords(params)),
     deleteRecords: (params) => gate.runMutation(() => client.deleteRecords(params))
@@ -38933,6 +39035,16 @@ function createNodeKintoneClient(baseUrl, tokenResolver) {
         appId
       );
       return flattenFormFieldProperties(res.properties);
+    },
+    async getProcessStatuses(appId) {
+      const qs = new URLSearchParams();
+      qs.set("app", String(appId));
+      qs.set("lang", "user");
+      const res = await requestJson(`${apiBasePath}/app/status.json?${qs.toString()}`, { method: "GET" }, appId);
+      return {
+        enable: res.enable,
+        states: Object.values(res.states ?? {}).map((state) => state.name)
+      };
     }
   };
 }
@@ -39440,6 +39552,12 @@ async function createKsqlRuntime(serverOptions, input) {
       if (!routed) throw new Error(`AuthError: profile "${binding.profile}" is not resolved for APP${appId}.`);
       return routed.getFields(binding.appId);
     },
+    getProcessStatuses: (appId) => {
+      const binding = resolveRuntimeBinding(runtimeContext.sqlContext, appId);
+      const routed = runtimeContext.clientsByProfile.get(binding.profile);
+      if (!routed) throw new Error(`AuthError: profile "${binding.profile}" is not resolved for APP${appId}.`);
+      return routed.getProcessStatuses(binding.appId);
+    },
     getApps: () => defaultClient.getApps()
   };
   const gatedClient = withRequestGate(
@@ -39664,7 +39782,10 @@ function noOpClient() {
     putRecords: fail,
     deleteRecords: fail,
     getApps: fail,
-    getFields: fail
+    getFields: fail,
+    async getProcessStatuses() {
+      return { enable: false, states: [] };
+    }
   };
 }
 function getServerConfigPath(serverOptions) {
@@ -40395,7 +40516,7 @@ Options:
   -h, --help         Show help
 `);
 }
-var SERVER_VERSION = true ? "2.5.0" : "0.0.0-dev";
+var SERVER_VERSION = true ? "2.7.0" : "0.0.0-dev";
 function createServer(args) {
   const server = new McpServer({
     name: "ksql-mcp",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rex0220/kintone-sql-tools",
-  "version": "2.5.0",
+  "version": "2.7.0",
   "description": "kintone SQL plugin, CLI, and MCP tools (ksql)",
   "publishConfig": {
     "access": "public"