@nahisaho/katashiro 0.2.3 → 0.2.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli-helpers.d.ts +43 -0
- package/dist/cli-helpers.d.ts.map +1 -0
- package/dist/cli-helpers.js +78 -0
- package/dist/cli-helpers.js.map +1 -0
- package/dist/cli.js +7 -21
- package/dist/cli.js.map +1 -1
- package/package.json +8 -8
- package/src/cli-helpers.ts +86 -0
- package/src/cli.ts +15 -22
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* CLI Helper Functions
|
|
3
|
+
* Extracted for better testability
|
|
4
|
+
*
|
|
5
|
+
* @requirement REQ-CLI-001
|
|
6
|
+
*/
|
|
7
|
+
import type { Content } from './index.js';
|
|
8
|
+
/**
|
|
9
|
+
* CLI用にContentオブジェクトを作成
|
|
10
|
+
*/
|
|
11
|
+
export declare function createContent(title: string, body: string, url?: string): Content;
|
|
12
|
+
/**
|
|
13
|
+
* 出力フォーマット検証
|
|
14
|
+
*/
|
|
15
|
+
export declare function isValidFormat(format: string): format is 'json' | 'text';
|
|
16
|
+
/**
|
|
17
|
+
* 検索プロバイダー検証
|
|
18
|
+
*/
|
|
19
|
+
export declare function isValidProvider(provider: string): provider is 'duckduckgo' | 'searxng';
|
|
20
|
+
/**
|
|
21
|
+
* 数値オプションのパース
|
|
22
|
+
*/
|
|
23
|
+
export declare function parseNumberOption(value: string, defaultValue: number): number;
|
|
24
|
+
/**
|
|
25
|
+
* テキスト出力のフォーマット
|
|
26
|
+
*/
|
|
27
|
+
export declare function formatSearchResult(result: {
|
|
28
|
+
title: string;
|
|
29
|
+
url: string;
|
|
30
|
+
snippet?: string;
|
|
31
|
+
}): string;
|
|
32
|
+
/**
|
|
33
|
+
* エラーメッセージのフォーマット
|
|
34
|
+
*/
|
|
35
|
+
export declare function formatError(error: unknown): string;
|
|
36
|
+
/**
|
|
37
|
+
* テキストを省略表示
|
|
38
|
+
*/
|
|
39
|
+
export declare function truncateText(text: string, maxLength: number): {
|
|
40
|
+
text: string;
|
|
41
|
+
omitted: number;
|
|
42
|
+
};
|
|
43
|
+
//# sourceMappingURL=cli-helpers.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cli-helpers.d.ts","sourceRoot":"","sources":["../src/cli-helpers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAE1C;;GAEG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,GAAE,MAAW,GAAG,OAAO,CAepF;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,MAAM,GAAG,MAAM,CAEvE;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,IAAI,YAAY,GAAG,SAAS,CAEtF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAG7E;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAOnG;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAKlD;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAQ/F"}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* CLI Helper Functions
|
|
3
|
+
* Extracted for better testability
|
|
4
|
+
*
|
|
5
|
+
* @requirement REQ-CLI-001
|
|
6
|
+
*/
|
|
7
|
+
import { generateId, formatTimestamp } from './index.js';
|
|
8
|
+
/**
|
|
9
|
+
* CLI用にContentオブジェクトを作成
|
|
10
|
+
*/
|
|
11
|
+
export function createContent(title, body, url = '') {
|
|
12
|
+
return {
|
|
13
|
+
id: generateId('CLI'),
|
|
14
|
+
type: 'article',
|
|
15
|
+
title,
|
|
16
|
+
body,
|
|
17
|
+
sources: url ? [{
|
|
18
|
+
id: generateId('SRC'),
|
|
19
|
+
url,
|
|
20
|
+
metadata: { title },
|
|
21
|
+
fetchedAt: formatTimestamp()
|
|
22
|
+
}] : [],
|
|
23
|
+
createdAt: formatTimestamp(),
|
|
24
|
+
updatedAt: formatTimestamp(),
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* 出力フォーマット検証
|
|
29
|
+
*/
|
|
30
|
+
export function isValidFormat(format) {
|
|
31
|
+
return format === 'json' || format === 'text';
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* 検索プロバイダー検証
|
|
35
|
+
*/
|
|
36
|
+
export function isValidProvider(provider) {
|
|
37
|
+
return provider === 'duckduckgo' || provider === 'searxng';
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* 数値オプションのパース
|
|
41
|
+
*/
|
|
42
|
+
export function parseNumberOption(value, defaultValue) {
|
|
43
|
+
const parsed = parseInt(value, 10);
|
|
44
|
+
return isNaN(parsed) || parsed <= 0 ? defaultValue : parsed;
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* テキスト出力のフォーマット
|
|
48
|
+
*/
|
|
49
|
+
export function formatSearchResult(result) {
|
|
50
|
+
let output = `📄 ${result.title}\n`;
|
|
51
|
+
output += ` ${result.url}\n`;
|
|
52
|
+
if (result.snippet) {
|
|
53
|
+
output += ` ${result.snippet.substring(0, 100)}...\n`;
|
|
54
|
+
}
|
|
55
|
+
return output;
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* エラーメッセージのフォーマット
|
|
59
|
+
*/
|
|
60
|
+
export function formatError(error) {
|
|
61
|
+
if (error instanceof Error) {
|
|
62
|
+
return error.message;
|
|
63
|
+
}
|
|
64
|
+
return String(error);
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
* テキストを省略表示
|
|
68
|
+
*/
|
|
69
|
+
export function truncateText(text, maxLength) {
|
|
70
|
+
if (text.length <= maxLength) {
|
|
71
|
+
return { text, omitted: 0 };
|
|
72
|
+
}
|
|
73
|
+
return {
|
|
74
|
+
text: text.substring(0, maxLength),
|
|
75
|
+
omitted: text.length - maxLength
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=cli-helpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cli-helpers.js","sourceRoot":"","sources":["../src/cli-helpers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAGzD;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,KAAa,EAAE,IAAY,EAAE,MAAc,EAAE;IACzE,OAAO;QACL,EAAE,EAAE,UAAU,CAAC,KAAK,CAAC;QACrB,IAAI,EAAE,SAAS;QACf,KAAK;QACL,IAAI;QACJ,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;gBACd,EAAE,EAAE,UAAU,CAAC,KAAK,CAAC;gBACrB,GAAG;gBACH,QAAQ,EAAE,EAAE,KAAK,EAAE;gBACnB,SAAS,EAAE,eAAe,EAAE;aAC7B,CAAC,CAAC,CAAC,CAAC,EAAE;QACP,SAAS,EAAE,eAAe,EAAE;QAC5B,SAAS,EAAE,eAAe,EAAE;KAC7B,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,MAAc;IAC1C,OAAO,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,MAAM,CAAC;AAChD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,QAAgB;IAC9C,OAAO,QAAQ,KAAK,YAAY,IAAI,QAAQ,KAAK,SAAS,CAAC;AAC7D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAa,EAAE,YAAoB;IACnE,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACnC,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC;AAC9D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAAwD;IACzF,IAAI,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,IAAI,CAAC;IACpC,MAAM,IAAI,MAAM,MAAM,CAAC,GAAG,IAAI,CAAC;IAC/B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,IAAI,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;IAC1D,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW,CAAC,KAAc;IACxC,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,OAAO,KAAK,CAAC,OAAO,CAAC;IACvB,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,IAAY,EAAE,SAAiB;IAC1D,IAAI,IAAI,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC;QAC7B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IAC9B,CAAC;IACD,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC;QAClC,OAAO,EAAE,IAAI,CAAC,MAAM,GAAG,SAAS;KACjC,CAAC;AACJ,CAAC"}
|
package/dist/cli.js
CHANGED
|
@@ -6,31 +6,17 @@
|
|
|
6
6
|
* @design DES-KATASHIRO-001 §2.6 CLI Interface
|
|
7
7
|
*/
|
|
8
8
|
import { Command } from 'commander';
|
|
9
|
-
import {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
id: generateId('CLI'),
|
|
16
|
-
type: 'article',
|
|
17
|
-
title,
|
|
18
|
-
body,
|
|
19
|
-
sources: url ? [{
|
|
20
|
-
id: generateId('SRC'),
|
|
21
|
-
url,
|
|
22
|
-
metadata: { title },
|
|
23
|
-
fetchedAt: formatTimestamp()
|
|
24
|
-
}] : [],
|
|
25
|
-
createdAt: formatTimestamp(),
|
|
26
|
-
updatedAt: formatTimestamp(),
|
|
27
|
-
};
|
|
28
|
-
}
|
|
9
|
+
import { createRequire } from 'module';
|
|
10
|
+
import { WebSearchClient, WebScraper, TextAnalyzer, EntityExtractor, SummaryGenerator, isOk, isErr } from './index.js';
|
|
11
|
+
import { createContent } from './cli-helpers.js';
|
|
12
|
+
// package.json からバージョンを取得
|
|
13
|
+
const require = createRequire(import.meta.url);
|
|
14
|
+
const pkg = require('../package.json');
|
|
29
15
|
const program = new Command();
|
|
30
16
|
program
|
|
31
17
|
.name('katashiro')
|
|
32
18
|
.description('KATASHIRO CLI - AI Research & Analysis Tool')
|
|
33
|
-
.version(
|
|
19
|
+
.version(pkg.version, '-v, --version', 'バージョンを表示');
|
|
34
20
|
// 検索コマンド
|
|
35
21
|
program
|
|
36
22
|
.command('search <query>')
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,IAAI,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACvH,OAAO,EACL,aAAa,EAOd,MAAM,kBAAkB,CAAC;AAE1B,0BAA0B;AAC1B,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/C,MAAM,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAEvC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,OAAO;KACJ,IAAI,CAAC,WAAW,CAAC;KACjB,WAAW,CAAC,6CAA6C,CAAC;KAC1D,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC;AAErD,SAAS;AACT,OAAO;KACJ,OAAO,CAAC,gBAAgB,CAAC;KACzB,WAAW,CAAC,UAAU,CAAC;KACvB,MAAM,CAAC,oBAAoB,EAAE,SAAS,EAAE,IAAI,CAAC;KAC7C,MAAM,CAAC,2BAA2B,EAAE,+BAA+B,EAAE,YAAY,CAAC;KAClF,MAAM,CAAC,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,CAAC;KAC3D,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,OAA0D,EAAE,EAAE;IAC1F,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAoC,CAAC;QAC9D,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE;YACzC,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACrC,QAAQ;SACT,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAChD,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,SAAS,KAAK,YAAY,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC;YAC3D,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;gBACxB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;gBAC3B,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;oBACd,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;gBACtD,CAAC;gBACD,OAAO,CAAC,GAAG,EAAE,CAAC;YAChB,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACxE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC;AAEL,cAAc;AACd,OAAO;KACJ,OAAO,CAAC,cAAc,CAAC;KACvB,WAAW,CAAC,cAAc,CAAC;KAC3B,MAAM,CAAC,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,CAAC;KAC3D,MAAM,CAAC,eAAe,EAAE,OAAO,EAAE,KAAK,CAAC;KACvC,MAAM,CAAC,KAAK,EAAE,GAAW,EAAE,OAA6C,EAAE,EAAE;IAC3E,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,UAAU,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAEzC,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;YAClB,OAAO,CAAC,KAAK,CAAC,aAAa,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACnD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC;QAE1B,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;YAClC,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAEvB,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,MAAM,UAAU,GAAG,IAAI,gBAAgB,EAAE,CAAC;gBAC1C,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;gBAClE,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,eAAe,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;gBAC9E,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;oBAClB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;oBACxB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;gBAC7C,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;oBAC/B,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,OAAO,CAAC,CAAC;gBAC3D,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACxE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC;AAEL,SAAS;AACT,OAAO;KACJ,OAAO,CAAC,gBAAgB,CAAC;KACzB,WAAW,CAAC,qBAAqB,CAAC;KAClC,MAAM,CAAC,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,CAAC;KAC3D,MAAM,CAAC,KAAK,EAAE,IAAY,EAAE,OAA2B,EAAE,EAAE;IAC1D,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,IAAI,YAAY,EAAE,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE5C,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YAC/B,OAAO,CAAC,GAAG,CAAC,aAAa,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACvD,OAAO,CAAC,GAAG,CAAC,UAAU,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;YACpD,OAAO,CAAC,GAAG,CAAC,aAAa,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC9D,OAAO,CAAC,GAAG,CAAC,WAAW,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,MAAM,CAAC,UAAU,CAAC,KAAK,GAAG,CAAC,CAAC;YAC/E,OAAO,CAAC,GAAG,CAAC,WAAW,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;YAC3C,OAAO,CAAC,GAAG,CAAC,UAAU,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACxE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC;AAEL,eAAe;AACf,OAAO;KACJ,OAAO,CAAC,gBAAgB,CAAC;KACzB,WAAW,CAAC,iBAAiB,CAAC;KAC9B,MAAM,CAAC,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,CAAC;KAC3D,MAAM,CAAC,KAAK,EAAE,IAAY,EAAE,OAA2B,EAAE,EAAE;IAC1D,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,IAAI,eAAe,EAAE,CAAC;QACxC,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE/C,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;YAEjC,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChC,OAAO,CAAC,GAAG,CAAC,UAAU,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACvD,CAAC;YACD,IAAI,QAAQ,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtC,OAAO,CAAC,GAAG,CAAC,UAAU,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC7D,CAAC;YACD,IAAI,QAAQ,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAClC,OAAO,CAAC,GAAG,CAAC,UAAU,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACzD,CAAC;YACD,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9B,OAAO,CAAC,GAAG,CAAC,UAAU,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACrD,CAAC;YACD,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,OAAO,CAAC,GAAG,CAAC,WAAW,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACrD,CAAC;YACD,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,OAAO,CAAC,GAAG,CAAC,WAAW,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACvD,CAAC;YACD,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,OAAO,CAAC,GAAG,CAAC,UAAU,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACtD,CAAC;YACD,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9B,OAAO,CAAC,GAAG,CAAC,UAAU,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACrD,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,YAAY,QAAQ,CAAC,GAAG,CAAC,MAAM,UAAU,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACxE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC;AAEL,SAAS;AACT,OAAO;KACJ,OAAO,CAAC,kBAAkB,CAAC;KAC3B,WAAW,CAAC,SAAS,CAAC;KACtB,MAAM,CAAC,uBAAuB,EAAE,UAAU,EAAE,KAAK,CAAC;KAClD,MAAM,CAAC,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,CAAC;KAC3D,MAAM,CAAC,KAAK,EAAE,IAAY,EAAE,OAA2C,EAAE,EAAE;IAC1E,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,gBAAgB,EAAE,CAAC;QAC1C,MAAM,OAAO,GAAG,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,eAAe,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;QAEtG,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;YAClB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAc,CAAC;YACpC,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC;QAE7B,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACjF,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAC3B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACrB,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,MAAM,YAAY,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACxE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC;AAEL,OAAO,CAAC,KAAK,EAAE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nahisaho/katashiro",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.5",
|
|
4
4
|
"description": "KATASHIRO - VS Code Agent Mode向け情報収集・分析・生成システム（オールインワンパッケージ）",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -76,13 +76,13 @@
|
|
|
76
76
|
"url": "https://github.com/nahisaho/katashiro/issues"
|
|
77
77
|
},
|
|
78
78
|
"dependencies": {
|
|
79
|
-
"@nahisaho/katashiro-analyzer": "
|
|
80
|
-
"@nahisaho/katashiro-collector": "
|
|
81
|
-
"@nahisaho/katashiro-core": "
|
|
82
|
-
"@nahisaho/katashiro-feedback": "
|
|
83
|
-
"@nahisaho/katashiro-generator": "
|
|
84
|
-
"@nahisaho/katashiro-knowledge": "
|
|
85
|
-
"@nahisaho/katashiro-mcp-server": "
|
|
79
|
+
"@nahisaho/katashiro-analyzer": "file:../analyzer",
|
|
80
|
+
"@nahisaho/katashiro-collector": "file:../collector",
|
|
81
|
+
"@nahisaho/katashiro-core": "file:../core",
|
|
82
|
+
"@nahisaho/katashiro-feedback": "file:../feedback",
|
|
83
|
+
"@nahisaho/katashiro-generator": "file:../generator",
|
|
84
|
+
"@nahisaho/katashiro-knowledge": "file:../knowledge",
|
|
85
|
+
"@nahisaho/katashiro-mcp-server": "file:../mcp-server",
|
|
86
86
|
"commander": "^12.1.0"
|
|
87
87
|
},
|
|
88
88
|
"engines": {
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* CLI Helper Functions
|
|
3
|
+
* Extracted for better testability
|
|
4
|
+
*
|
|
5
|
+
* @requirement REQ-CLI-001
|
|
6
|
+
*/
|
|
7
|
+
|
|
8
|
+
import { generateId, formatTimestamp } from './index.js';
|
|
9
|
+
import type { Content } from './index.js';
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* CLI用にContentオブジェクトを作成
|
|
13
|
+
*/
|
|
14
|
+
export function createContent(title: string, body: string, url: string = ''): Content {
|
|
15
|
+
return {
|
|
16
|
+
id: generateId('CLI'),
|
|
17
|
+
type: 'article',
|
|
18
|
+
title,
|
|
19
|
+
body,
|
|
20
|
+
sources: url ? [{
|
|
21
|
+
id: generateId('SRC'),
|
|
22
|
+
url,
|
|
23
|
+
metadata: { title },
|
|
24
|
+
fetchedAt: formatTimestamp()
|
|
25
|
+
}] : [],
|
|
26
|
+
createdAt: formatTimestamp(),
|
|
27
|
+
updatedAt: formatTimestamp(),
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* 出力フォーマット検証
|
|
33
|
+
*/
|
|
34
|
+
export function isValidFormat(format: string): format is 'json' | 'text' {
|
|
35
|
+
return format === 'json' || format === 'text';
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* 検索プロバイダー検証
|
|
40
|
+
*/
|
|
41
|
+
export function isValidProvider(provider: string): provider is 'duckduckgo' | 'searxng' {
|
|
42
|
+
return provider === 'duckduckgo' || provider === 'searxng';
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/**
|
|
46
|
+
* 数値オプションのパース
|
|
47
|
+
*/
|
|
48
|
+
export function parseNumberOption(value: string, defaultValue: number): number {
|
|
49
|
+
const parsed = parseInt(value, 10);
|
|
50
|
+
return isNaN(parsed) || parsed <= 0 ? defaultValue : parsed;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/**
|
|
54
|
+
* テキスト出力のフォーマット
|
|
55
|
+
*/
|
|
56
|
+
export function formatSearchResult(result: { title: string; url: string; snippet?: string }): string {
|
|
57
|
+
let output = `📄 ${result.title}\n`;
|
|
58
|
+
output += ` ${result.url}\n`;
|
|
59
|
+
if (result.snippet) {
|
|
60
|
+
output += ` ${result.snippet.substring(0, 100)}...\n`;
|
|
61
|
+
}
|
|
62
|
+
return output;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
/**
|
|
66
|
+
* エラーメッセージのフォーマット
|
|
67
|
+
*/
|
|
68
|
+
export function formatError(error: unknown): string {
|
|
69
|
+
if (error instanceof Error) {
|
|
70
|
+
return error.message;
|
|
71
|
+
}
|
|
72
|
+
return String(error);
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
/**
|
|
76
|
+
* テキストを省略表示
|
|
77
|
+
*/
|
|
78
|
+
export function truncateText(text: string, maxLength: number): { text: string; omitted: number } {
|
|
79
|
+
if (text.length <= maxLength) {
|
|
80
|
+
return { text, omitted: 0 };
|
|
81
|
+
}
|
|
82
|
+
return {
|
|
83
|
+
text: text.substring(0, maxLength),
|
|
84
|
+
omitted: text.length - maxLength
|
|
85
|
+
};
|
|
86
|
+
}
|
package/src/cli.ts
CHANGED
|
@@ -7,35 +7,28 @@
|
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
9
|
import { Command } from 'commander';
|
|
10
|
-
import {
|
|
11
|
-
import
|
|
10
|
+
import { createRequire } from 'module';
|
|
11
|
+
import { WebSearchClient, WebScraper, TextAnalyzer, EntityExtractor, SummaryGenerator, isOk, isErr } from './index.js';
|
|
12
|
+
import {
|
|
13
|
+
createContent,
|
|
14
|
+
isValidFormat,
|
|
15
|
+
isValidProvider,
|
|
16
|
+
parseNumberOption,
|
|
17
|
+
formatSearchResult,
|
|
18
|
+
formatError,
|
|
19
|
+
truncateText
|
|
20
|
+
} from './cli-helpers.js';
|
|
12
21
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
function createContent(title: string, body: string, url: string = ''): Content {
|
|
17
|
-
return {
|
|
18
|
-
id: generateId('CLI'),
|
|
19
|
-
type: 'article',
|
|
20
|
-
title,
|
|
21
|
-
body,
|
|
22
|
-
sources: url ? [{
|
|
23
|
-
id: generateId('SRC'),
|
|
24
|
-
url,
|
|
25
|
-
metadata: { title },
|
|
26
|
-
fetchedAt: formatTimestamp()
|
|
27
|
-
}] : [],
|
|
28
|
-
createdAt: formatTimestamp(),
|
|
29
|
-
updatedAt: formatTimestamp(),
|
|
30
|
-
};
|
|
31
|
-
}
|
|
22
|
+
// package.json からバージョンを取得
|
|
23
|
+
const require = createRequire(import.meta.url);
|
|
24
|
+
const pkg = require('../package.json');
|
|
32
25
|
|
|
33
26
|
const program = new Command();
|
|
34
27
|
|
|
35
28
|
program
|
|
36
29
|
.name('katashiro')
|
|
37
30
|
.description('KATASHIRO CLI - AI Research & Analysis Tool')
|
|
38
|
-
.version(
|
|
31
|
+
.version(pkg.version, '-v, --version', 'バージョンを表示');
|
|
39
32
|
|
|
40
33
|
// 検索コマンド
|
|
41
34
|
program
|