@helpfeel/cosense-cli 1.4.1 → 1.4.3

package/package.json

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

package/src/commands/login.ts

@@ -1,27 +1,32 @@
-import { parseOrigin } from '../lib/parseUrl.ts';
-import { settingsPath, writeUserToken } from '../lib/settings.ts';
+import { parseOrigin, parseProjectUrlStrict } from '../lib/parseUrl.ts';
+import {
+  settingsPath,
+  writeProjectServiceAccount,
+  writeUserToken
+} from '../lib/settings.ts';
 
-export const loginSummary = 'Personal Access Tokenを設定ファイルに保存する';
+export const loginSummary =
+  'Personal Access Token または Service Account を設定ファイルに保存する';
 
-export const loginHelp = `login - Personal Access Tokenを設定ファイルに保存する
+export const loginHelp = `login - Personal Access Token または Service Account を設定ファイルに保存する
 
 Usage:
-  cosense login <origin>
+  cosense login <origin|projectUrl>
 
 引数:
-  <origin>  Cosenseサーバーのorigin（例: https://scrapbox.io）
+  <origin>      Cosenseサーバーのorigin（例: https://scrapbox.io）
+  <projectUrl>  プロジェクトURL（例: https://scrapbox.io/Nota）
 
 動作:
-  - PAT発行URL（<origin>/settings/personal-access-tokens）を出力し、PAT入力を求める
-  - 入力されたPATを ~/.cosense/settings.json の users[] に書き込む
-  - 同じoriginの既存entryは上書きされる
-  - 設定ファイルとディレクトリは存在しなければ作成する（dir 0700, file 0600）
+  - 設定ファイル: ~/.cosense/settings.json（dir 0700, file 0600）
   - interactive terminal（TTY）でのみ動作する
 
 環境変数:
   COSENSE_PAT  設定されていれば、ファイルに保存された認証情報より優先される
 `;
 
+const SERVICE_ACCOUNT_PREFIX = 'cs_';
+
 const readMaskedLine = async (): Promise<string> => {
   if (!process.stdin.isTTY) {
     throw new Error(
@@ -68,20 +73,43 @@ const readMaskedLine = async (): Promise<string> => {
   return chars.join('');
 };
 
-export const login = async (args: string[]): Promise<void> => {
-  const [originArg, ...rest] = args;
-  if (!originArg) throw new Error('Usage: cosense login <origin>');
-  if (rest.length > 0) {
-    throw new Error(`Unexpected argument: ${rest[0]}`);
-  }
-  const origin = parseOrigin(originArg);
+interface OriginTarget {
+  kind: 'origin';
+  origin: string;
+}
 
-  if (!process.stdin.isTTY) {
+interface ProjectTarget {
+  kind: 'project';
+  origin: string;
+  projectName: string;
+}
+
+type LoginTarget = OriginTarget | ProjectTarget;
+
+const parseTarget = (input: string): LoginTarget => {
+  let url: URL;
+  try {
+    url = new URL(input);
+  } catch {
     throw new Error(
-      'cosense login must be run in an interactive terminal (TTY)'
+      `<origin|projectUrl> is not a valid URL: ${input}. ` +
+        `例: https://scrapbox.io または https://scrapbox.io/<project>`
+    );
+  }
+  if (url.protocol !== 'http:' && url.protocol !== 'https:') {
+    throw new Error(
+      `<origin|projectUrl> must use http: or https: scheme: ${input}`
     );
   }
+  const parts = url.pathname.split('/').filter(Boolean);
+  if (parts.length === 0 && !url.search && !url.hash) {
+    return { kind: 'origin', origin: parseOrigin(input) };
+  }
+  const { origin, projectName } = parseProjectUrlStrict(input);
+  return { kind: 'project', origin, projectName };
+};
 
+const promptOrigin = (origin: string): void => {
   process.stdout.write(
     [
       `Personal Access Token (PAT) を発行する:`,
@@ -91,12 +119,67 @@ export const login = async (args: string[]): Promise<void> => {
       `PAT: `
     ].join('\n')
   );
+};
+
+const promptProject = (origin: string, projectName: string): void => {
+  process.stdout.write(
+    [
+      `Personal Access Token (PAT) を発行する:`,
+      `  ${origin}/settings/personal-access-tokens`,
+      ``,
+      `または、Service Account を発行する（あなたが Business Project の管理者である場合）:`,
+      `  1. ${origin}/${projectName} の Project Settings から Service Accounts ページを開く`,
+      `  2. "Purpose of using API" に任意の内容を入力して Add`,
+      `  3. 登録された Service Account の "Show Access Key" → Copy`,
+      ``,
+      `発行した PAT または Service Account を以下に貼り付けて Enter`,
+      `（入力は * でマスクされる。Service Account は cs_ で始まる）:`,
+      `TOKEN: `
+    ].join('\n')
+  );
+};
+
+export const login = async (args: string[]): Promise<void> => {
+  const [targetArg, ...rest] = args;
+  if (!targetArg) throw new Error('Usage: cosense login <origin|projectUrl>');
+  if (rest.length > 0) {
+    throw new Error(`Unexpected argument: ${rest[0]}`);
+  }
+  const target = parseTarget(targetArg);
+
+  if (!process.stdin.isTTY) {
+    throw new Error(
+      'cosense login must be run in an interactive terminal (TTY)'
+    );
+  }
+
+  if (target.kind === 'origin') {
+    promptOrigin(target.origin);
+  } else {
+    promptProject(target.origin, target.projectName);
+  }
 
   const token = (await readMaskedLine()).trim();
   if (!token) {
-    throw new Error('PAT is empty');
+    throw new Error('Token is empty');
+  }
+
+  const isServiceAccount = token.startsWith(SERVICE_ACCOUNT_PREFIX);
+
+  if (isServiceAccount) {
+    if (target.kind === 'origin') {
+      throw new Error(
+        'Service Account を登録するには project URL を指定してください: ' +
+          'cosense login <origin>/<project>'
+      );
+    }
+    writeProjectServiceAccount(target.origin, target.projectName, token);
+    process.stdout.write(
+      `Saved Service Account for ${target.origin}/${target.projectName} to ${settingsPath}\n`
+    );
+    return;
   }
 
-  writeUserToken(origin, token);
-  process.stdout.write(`Saved PAT for ${origin} to ${settingsPath}\n`);
+  writeUserToken(target.origin, token);
+  process.stdout.write(`Saved PAT for ${target.origin} to ${settingsPath}\n`);
 };

package/src/lib/settings.ts

@@ -158,8 +158,7 @@ const loadSettings = (): Settings | null => {
   return value;
 };
 
-export const writeUserToken = (origin: string, token: string): void => {
-  let raw: Record<string, unknown>;
+const readRawSettings = (): Record<string, unknown> => {
   try {
     const text = readFileSync(SETTINGS_PATH, 'utf8');
     let parsed: unknown;
@@ -177,15 +176,28 @@ export const writeUserToken = (origin: string, token: string): void => {
     ) {
       throw new Error(`${SETTINGS_PATH}: must be an object`);
     }
-    raw = parsed as Record<string, unknown>;
+    return parsed as Record<string, unknown>;
   } catch (err) {
     if ((err as NodeJS.ErrnoException).code === 'ENOENT') {
-      raw = {};
-    } else {
-      throw err;
+      return {};
     }
+    throw err;
   }
+};
 
+const writeRawSettings = (raw: Record<string, unknown>): void => {
+  const dir = dirname(SETTINGS_PATH);
+  mkdirSync(dir, { recursive: true, mode: 0o700 });
+  chmodSync(dir, 0o700);
+  writeFileSync(SETTINGS_PATH, `${JSON.stringify(raw, null, 2)}\n`, {
+    mode: 0o600
+  });
+  chmodSync(SETTINGS_PATH, 0o600);
+  cache = undefined;
+};
+
+export const writeUserToken = (origin: string, token: string): void => {
+  const raw = readRawSettings();
   const existing = Array.isArray(raw.users) ? (raw.users as unknown[]) : [];
   const filtered = existing.filter(entry => {
     if (typeof entry !== 'object' || entry === null) return true;
@@ -199,15 +211,37 @@ export const writeUserToken = (origin: string, token: string): void => {
   });
   filtered.push({ url: origin, token });
   raw.users = filtered;
+  writeRawSettings(raw);
+};
 
-  const dir = dirname(SETTINGS_PATH);
-  mkdirSync(dir, { recursive: true, mode: 0o700 });
-  chmodSync(dir, 0o700);
-  writeFileSync(SETTINGS_PATH, `${JSON.stringify(raw, null, 2)}\n`, {
-    mode: 0o600
+export const writeProjectServiceAccount = (
+  origin: string,
+  projectName: string,
+  serviceAccount: string
+): void => {
+  const raw = readRawSettings();
+  const projectNameLc = projectName.toLowerCase();
+  const existing = Array.isArray(raw.projects)
+    ? (raw.projects as unknown[])
+    : [];
+  const filtered = existing.filter(entry => {
+    if (typeof entry !== 'object' || entry === null) return true;
+    const url = (entry as { url?: unknown }).url;
+    if (typeof url !== 'string') return true;
+    try {
+      const parsed = new URL(url);
+      const existingName = parsed.pathname.split('/').filter(Boolean)[0];
+      if (!existingName) return true;
+      return !(
+        parsed.origin === origin && existingName.toLowerCase() === projectNameLc
+      );
+    } catch {
+      return true;
+    }
   });
-  chmodSync(SETTINGS_PATH, 0o600);
-  cache = undefined;
+  filtered.push({ url: `${origin}/${projectName}`, serviceAccount });
+  raw.projects = filtered;
+  writeRawSettings(raw);
 };
 
 export const settingsPath = SETTINGS_PATH;