@helpfeel/cosense-cli 1.5.2 → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helpfeel/cosense-cli",
-  "version": "1.5.2",
+  "version": "1.6.0",
   "description": "Cosense (旧Scrapbox) のページを読み・調べ・編集するAgent Skill用のCLI",
   "homepage": "https://github.com/helpfeel/cosense-cli",
   "license": "MIT",

package/src/commands/browsePage.ts

@@ -11,6 +11,7 @@ import { requestJson } from '../lib/request.ts';
 import {
   enrichPageUsers,
   fetchUserMap,
+  serviceAccountSuffix,
   type UserMap
 } from '../lib/resolveUsers.ts';
 import { resolveCredential } from '../lib/settings.ts';
@@ -85,6 +86,8 @@ interface UserRef {
   id?: string;
   name?: string;
   displayName?: string;
+  isServiceAccount?: boolean;
+  isServiceAccountDeleted?: boolean;
 }
 
 interface InfoboxResult {
@@ -129,8 +132,12 @@ const extractFragment = (input: string): string | null => {
 
 const formatUserDisplay = (u: UserRef | null | undefined): string | null => {
   if (!u) return null;
-  if (u.displayName && u.name) return `${u.displayName} (${u.name})`;
-  return u.displayName ?? u.name ?? u.id ?? null;
+  const base =
+    u.displayName && u.name
+      ? `${u.displayName} (${u.name})`
+      : (u.displayName ?? u.name ?? u.id ?? null);
+  if (base === null) return null;
+  return `${base}${serviceAccountSuffix(u)}`;
 };
 
 const formatDateYMD = (unixSec: number): string => {
@@ -232,7 +239,8 @@ const renderTelomere = (
   if (entries.length === 0) return null;
   const lines = entries.map(e => {
     const info = userMap.get(e.userId);
-    const name = info?.displayName ?? info?.name ?? e.userId;
+    const base = info?.displayName ?? info?.name ?? e.userId;
+    const name = info ? `${base}${serviceAccountSuffix(info)}` : base;
     return `- ${name}\t更新期間 ${formatDateYMD(e.minUpdated)} 〜 ${formatDateYMD(e.maxUpdated)}\t${e.lineCount}行更新`;
   });
   return `## テロメアのサマリー\n\n${lines.join('\n')}`;

package/src/commands/browsePageChanges.ts

@@ -2,7 +2,11 @@ import { encodeTitleForUrl } from '../lib/encodeTitle.ts';
 import { formatTimestamp } from '../lib/formatTimestamp.ts';
 import { parseProjectUrlStrict } from '../lib/parseUrl.ts';
 import { requestJson } from '../lib/request.ts';
-import { fetchUserMap, type UserMap } from '../lib/resolveUsers.ts';
+import {
+  fetchUserMap,
+  serviceAccountSuffix,
+  type UserMap
+} from '../lib/resolveUsers.ts';
 import { resolveCredential } from '../lib/settings.ts';
 
 export const browsePageChangesSummary =
@@ -102,7 +106,9 @@ const resolveUserName = (
 ): string => {
   if (!userId) return '不明なユーザー';
   const info = userMap.get(userId);
-  return info?.displayName ?? info?.name ?? userId;
+  if (!info) return userId;
+  const base = info.displayName ?? info.name ?? userId;
+  return `${base}${serviceAccountSuffix(info)}`;
 };
 
 const quote = (text: string | undefined): string => `「${text ?? ''}」`;

package/src/commands/readProjectMembers.ts

@@ -14,8 +14,10 @@ Usage:
   <projectUrl>  プロジェクトのURL（例: https://scrapbox.io/shokai）
 
 戻り値（top-levelの主なkey）:
-  users           Array<User>          現メンバー一覧
-  memberSnapshots Array<Snapshot>?     退去済みメンバーの記録
+  users                   Array<User>            現メンバー一覧
+  memberSnapshots         Array<Snapshot>?       退去済みメンバーの記録
+  serviceAccounts         Array<ServiceAccount>? Service Account一覧
+  serviceAccountSnapshots Array<ServiceAccount>? 削除済みService Accountの記録
 
 User の field:
   id           string    Cosense内部のID
@@ -34,6 +36,10 @@ Snapshot の field:
   updated string                            退去者snapshot更新時刻
   data    { id, name?, displayName?, email? } 退去時のユーザー情報
 
+ServiceAccount の field:
+  id     string   Service AccountのID（このIDでページ・行の著者を同定できる）
+  usage  string   用途ラベル（著者の表示名として使う）
+
 戻り値のJSON抜粋例:
 {
   "users": [
@@ -60,6 +66,12 @@ Snapshot の field:
         "email": "former@example.com"
       }
     }
+  ],
+  "serviceAccounts": [
+    { "id": "6a44...", "usage": "CLI test" }
+  ],
+  "serviceAccountSnapshots": [
+    { "id": "6a1a...", "usage": "Cosense CLI" }
   ]
 }
 `;

package/src/commands/search1hopLinks.ts

@@ -8,11 +8,17 @@ export const search1hopLinksSummary = '1-hop近傍を全文検索でフィルタ
 export const search1hopLinksHelp = `search1hopLinks - 1-hop近傍を全文検索でフィルタする
 
 Usage:
-  cosense search1hopLinks <pageUrl> <query>
+  cosense search1hopLinks <pageUrl> <query> [--or]
 
 引数:
   <pageUrl>  対象ページの完全なURL
-  <query>    全文検索クエリ（必須・空文字は弾かれる）
+  <query>    全文検索クエリ（必須。空文字は弾かれる）
+
+オプション:
+  --or  複数語のいずれかにマッチするページを返す（既定はAND）
+
+例:
+  cosense search1hopLinks https://scrapbox.io/shokai/カレー "うどん ラーメン" --or
 
 戻り値（top-levelの主なkey）:
   links1hop  Array<Link>  query を本文に含む1-hop近傍ページ
@@ -20,19 +26,35 @@ Usage:
 
 各 Link の field（list1hopLinksに加えて）:
   search  検索ハイライト情報
-
-検索の制約:
-  - OR検索不可
 `;
 
-export const search1hopLinks = async (args: string[]): Promise<void> => {
-  const [url, query] = args;
-  if (args.length !== 2 || !url || !query || query.trim() === '') {
-    throw new Error('Usage: cosense search1hopLinks <pageUrl> <query>');
+const parseArgs = (
+  args: string[]
+): { url: string; query: string; or: boolean } => {
+  const usage = 'Usage: cosense search1hopLinks <pageUrl> <query> [--or]';
+  let or = false;
+  const positional: string[] = [];
+  for (const arg of args) {
+    if (arg === '--or') {
+      or = true;
+    } else if (arg.startsWith('--')) {
+      throw new Error(`Unknown option: ${arg}\n${usage}`);
+    } else {
+      positional.push(arg);
+    }
   }
+  const [url, query] = positional;
+  if (positional.length !== 2 || !url || !query || query.trim() === '') {
+    throw new Error(usage);
+  }
+  return { url, query, or };
+};
+
+export const search1hopLinks = async (args: string[]): Promise<void> => {
+  const { url, query, or } = parseArgs(args);
   const { origin, projectName } = parsePageUrl(url);
   const [data, userMap] = await Promise.all([
-    fetchRelatedPagesWithRelations(url, query),
+    fetchRelatedPagesWithRelations(url, query, or),
     fetchUserMap(origin, projectName)
   ]);
   for (const page of (data as { links1hop?: unknown[] }).links1hop ?? []) {

package/src/commands/search2hopLinks.ts

@@ -8,11 +8,17 @@ export const search2hopLinksSummary = '2-hop近傍を全文検索でフィルタ
 export const search2hopLinksHelp = `search2hopLinks - 2-hop近傍を全文検索でフィルタする
 
 Usage:
-  cosense search2hopLinks <pageUrl> <query>
+  cosense search2hopLinks <pageUrl> <query> [--or]
 
 引数:
   <pageUrl>  対象ページの完全なURL
-  <query>    全文検索クエリ（必須・空文字は弾かれる）
+  <query>    全文検索クエリ（必須。空文字は弾かれる）
+
+オプション:
+  --or  複数語のいずれかにマッチするページを返す（既定はAND）
+
+例:
+  cosense search2hopLinks https://scrapbox.io/shokai/カレー "うどん ラーメン" --or
 
 戻り値（top-levelの主なkey）:
   links2hop  Array<Link>  query を本文に含む2-hop近傍ページ
@@ -20,19 +26,35 @@ Usage:
 
 各 Link の field（list2hopLinksに加えて）:
   search  検索ハイライト情報
-
-検索の制約:
-  - OR検索不可
 `;
 
-export const search2hopLinks = async (args: string[]): Promise<void> => {
-  const [url, query] = args;
-  if (args.length !== 2 || !url || !query || query.trim() === '') {
-    throw new Error('Usage: cosense search2hopLinks <pageUrl> <query>');
+const parseArgs = (
+  args: string[]
+): { url: string; query: string; or: boolean } => {
+  const usage = 'Usage: cosense search2hopLinks <pageUrl> <query> [--or]';
+  let or = false;
+  const positional: string[] = [];
+  for (const arg of args) {
+    if (arg === '--or') {
+      or = true;
+    } else if (arg.startsWith('--')) {
+      throw new Error(`Unknown option: ${arg}\n${usage}`);
+    } else {
+      positional.push(arg);
+    }
   }
+  const [url, query] = positional;
+  if (positional.length !== 2 || !url || !query || query.trim() === '') {
+    throw new Error(usage);
+  }
+  return { url, query, or };
+};
+
+export const search2hopLinks = async (args: string[]): Promise<void> => {
+  const { url, query, or } = parseArgs(args);
   const { origin, projectName } = parsePageUrl(url);
   const [data, userMap] = await Promise.all([
-    fetchRelatedPages(url, 2, query),
+    fetchRelatedPages(url, 2, query, or),
     fetchUserMap(origin, projectName)
   ]);
   for (const page of (data as { links2hop?: unknown[] }).links2hop ?? []) {

package/src/commands/searchFullText.ts

@@ -9,12 +9,19 @@ export const searchFullTextSummary = '本文全文を対象に検索する';
 export const searchFullTextHelp = `searchFullText - 本文全文を対象に検索する
 
 Usage:
-  cosense searchFullText <projectUrl> <query>
+  cosense searchFullText <projectUrl> <query> [--or] [--sort <pageRank|updated>]
 
 引数:
   <projectUrl>  プロジェクトのURL（例: https://scrapbox.io/shokai/）
   <query>       検索クエリ
 
+オプション:
+  --or                       複数語のいずれかにマッチするページを返す（既定はAND）
+  --sort <pageRank|updated>  並び順（既定はpageRank）
+
+例:
+  cosense searchFullText https://scrapbox.io/shokai/ "デザイン 設計 design UI UX プロトタイプ" --or
+
 戻り値（top-levelの主なkey）:
   projectName            string         プロジェクト名
   searchQuery            string         実行されたクエリ
@@ -63,13 +70,56 @@ interface SearchFullTextData {
   }[];
 }
 
-export const searchFullText = async (args: string[]): Promise<void> => {
-  const [url, query] = args;
-  if (!url || !query) {
-    throw new Error('Usage: cosense searchFullText <projectUrl> <query>');
+interface ParsedArgs {
+  projectUrl: string;
+  query: string;
+  or: boolean;
+  sort?: string;
+}
+
+const parseArgs = (args: string[]): ParsedArgs => {
+  const usage =
+    'Usage: cosense searchFullText <projectUrl> <query> [--or] [--sort <pageRank|updated>]';
+  let or = false;
+  let sort: string | undefined;
+  const positional: string[] = [];
+  for (let i = 0; i < args.length; i += 1) {
+    const arg = args[i] as string;
+    if (arg === '--or') {
+      or = true;
+    } else if (arg === '--sort') {
+      const value = args[i + 1];
+      if (value === undefined || value.startsWith('--')) {
+        throw new Error(`--sort requires a value\n${usage}`);
+      }
+      if (value !== 'pageRank' && value !== 'updated') {
+        throw new Error(`--sort must be pageRank or updated\n${usage}`);
+      }
+      sort = value;
+      i += 1;
+    } else if (arg.startsWith('--')) {
+      throw new Error(`Unknown option: ${arg}\n${usage}`);
+    } else {
+      positional.push(arg);
+    }
   }
-  const { origin, projectName } = parseProjectUrl(url);
-  const apiUrl = `${origin}/api/pages/${projectName}/search/query?q=${encodeURIComponent(query)}`;
+  if (positional.length !== 2 || !positional[1]) {
+    throw new Error(usage);
+  }
+  return {
+    projectUrl: positional[0] as string,
+    query: positional[1] as string,
+    or,
+    sort
+  };
+};
+
+export const searchFullText = async (args: string[]): Promise<void> => {
+  const { projectUrl, query, or, sort } = parseArgs(args);
+  const { origin, projectName } = parseProjectUrl(projectUrl);
+  let apiUrl = `${origin}/api/pages/${projectName}/search/query?q=${encodeURIComponent(query)}`;
+  if (or) apiUrl += '&op=or';
+  if (sort) apiUrl += `&sort=${sort}`;
   const credential = resolveCredential(origin, projectName);
   const data = (await requestJson(apiUrl, {
     credential

package/src/lib/annotateRelations.ts

@@ -41,10 +41,12 @@ const computeRelation = (
 
 export const fetchRelatedPagesWithRelations = async (
   url: string,
-  query?: string
+  query?: string,
+  or?: boolean
 ): Promise<RelatedPagesData> => {
   const { origin, projectName, encodedTitle } = parsePageUrl(url);
-  const queryParam = query ? `?search=${encodeURIComponent(query)}` : '';
+  let queryParam = query ? `?search=${encodeURIComponent(query)}` : '';
+  if (or) queryParam += queryParam ? '&op=or' : '?op=or';
   const startPageUrl = `${origin}/api/pages/v2/${projectName}/${encodedTitle}`;
   const relatedUrl = `${startPageUrl}/links1hop${queryParam}`;
   const credential = resolveCredential(origin, projectName);

package/src/lib/relatedPages.ts

@@ -5,10 +5,12 @@ import { resolveCredential } from './settings.ts';
 export const fetchRelatedPages = async (
   url: string,
   hop: 1 | 2,
-  query?: string
+  query?: string,
+  or?: boolean
 ): Promise<unknown> => {
   const { origin, projectName, encodedTitle } = parsePageUrl(url);
-  const queryParam = query ? `?search=${encodeURIComponent(query)}` : '';
+  let queryParam = query ? `?search=${encodeURIComponent(query)}` : '';
+  if (or) queryParam += queryParam ? '&op=or' : '?op=or';
   const apiUrl = `${origin}/api/pages/v2/${projectName}/${encodedTitle}/links${hop}hop${queryParam}`;
   const credential = resolveCredential(origin, projectName);
   return requestJson(apiUrl, { credential });

package/src/lib/resolveUsers.ts

@@ -5,6 +5,8 @@ interface UserInfo {
   name?: string;
   displayName?: string;
   email?: string;
+  isServiceAccount?: boolean;
+  isServiceAccountDeleted?: boolean;
 }
 
 export type UserMap = Map<string, UserInfo>;
@@ -20,9 +22,16 @@ interface MemberSnapshotEntry {
   data?: UserEntry;
 }
 
+interface ServiceAccountEntry {
+  id?: unknown;
+  usage?: unknown;
+}
+
 interface UsersResponse {
   users?: UserEntry[];
   memberSnapshots?: MemberSnapshotEntry[];
+  serviceAccounts?: ServiceAccountEntry[];
+  serviceAccountSnapshots?: ServiceAccountEntry[];
 }
 
 const cache = new Map<string, UserMap>();
@@ -30,6 +39,18 @@ const cache = new Map<string, UserMap>();
 const stringOrUndefined = (value: unknown): string | undefined =>
   typeof value === 'string' && value !== '' ? value : undefined;
 
+// Service Account著者の表示名末尾に付ける注記。名前を文字列整形するコマンド
+// (browsePage / browsePageChanges) で共用し、usageが人間名に見えるのを防ぐ
+export const serviceAccountSuffix = (info: {
+  isServiceAccount?: boolean;
+  isServiceAccountDeleted?: boolean;
+}): string => {
+  if (!info.isServiceAccount) return '';
+  return info.isServiceAccountDeleted
+    ? ' (deleted service account)'
+    : ' (service account)';
+};
+
 const buildUserInfo = (entry: UserEntry): UserInfo => {
   const info: UserInfo = {};
   const name = stringOrUndefined(entry.name);
@@ -66,6 +87,23 @@ export const fetchUserMap = async (
     if (!id || map.has(id)) continue;
     map.set(id, buildUserInfo(entry));
   }
+  for (const entry of data.serviceAccounts ?? []) {
+    const id = stringOrUndefined(entry.id);
+    if (!id || map.has(id)) continue;
+    map.set(id, {
+      displayName: stringOrUndefined(entry.usage),
+      isServiceAccount: true
+    });
+  }
+  for (const entry of data.serviceAccountSnapshots ?? []) {
+    const id = stringOrUndefined(entry.id);
+    if (!id || map.has(id)) continue;
+    map.set(id, {
+      displayName: stringOrUndefined(entry.usage),
+      isServiceAccount: true,
+      isServiceAccountDeleted: true
+    });
+  }
 
   cache.set(cacheKey, map);
   return map;