@dollhousemcp/mcp-server 1.7.3 → 1.7.4
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/config/ConfigWizard.d.ts +78 -0
- package/dist/config/ConfigWizard.d.ts.map +1 -0
- package/dist/config/ConfigWizard.js +370 -0
- package/dist/config/ConfigWizardCheck.d.ts +47 -0
- package/dist/config/ConfigWizardCheck.d.ts.map +1 -0
- package/dist/config/ConfigWizardCheck.js +208 -0
- package/dist/config/ConfigWizardDisplay.d.ts +64 -0
- package/dist/config/ConfigWizardDisplay.d.ts.map +1 -0
- package/dist/config/ConfigWizardDisplay.js +150 -0
- package/dist/config/WizardFirstResponse.d.ts +25 -0
- package/dist/config/WizardFirstResponse.d.ts.map +1 -0
- package/dist/config/WizardFirstResponse.js +118 -0
- package/dist/config/portfolioConfig.d.ts +40 -0
- package/dist/config/portfolioConfig.d.ts.map +1 -0
- package/dist/config/portfolioConfig.js +58 -0
- package/dist/config/wizardTemplates.d.ts +84 -0
- package/dist/config/wizardTemplates.d.ts.map +1 -0
- package/dist/config/wizardTemplates.js +195 -0
- package/dist/elements/BaseElement.d.ts +15 -0
- package/dist/elements/BaseElement.d.ts.map +1 -1
- package/dist/elements/BaseElement.js +38 -5
- package/dist/generated/version.d.ts +2 -2
- package/dist/generated/version.js +3 -3
- package/dist/handlers/PortfolioPullHandler.d.ts +69 -0
- package/dist/handlers/PortfolioPullHandler.d.ts.map +1 -0
- package/dist/handlers/PortfolioPullHandler.js +340 -0
- package/dist/scripts/scripts/run-config-wizard.js +57 -0
- package/dist/scripts/src/config/ConfigManager.js +799 -0
- package/dist/scripts/src/config/ConfigWizard.js +368 -0
- package/dist/scripts/src/errors/SecurityError.js +47 -0
- package/dist/scripts/src/security/constants.js +28 -0
- package/dist/scripts/src/security/contentValidator.js +415 -0
- package/dist/scripts/src/security/errors.js +32 -0
- package/dist/scripts/src/security/regexValidator.js +217 -0
- package/dist/scripts/src/security/secureYamlParser.js +272 -0
- package/dist/scripts/src/security/securityMonitor.js +111 -0
- package/dist/scripts/src/security/validators/unicodeValidator.js +315 -0
- package/dist/scripts/src/utils/logger.js +288 -0
- package/dist/sync/PortfolioDownloader.d.ts +27 -0
- package/dist/sync/PortfolioDownloader.d.ts.map +1 -0
- package/dist/sync/PortfolioDownloader.js +120 -0
- package/dist/sync/PortfolioSyncComparer.d.ts +50 -0
- package/dist/sync/PortfolioSyncComparer.d.ts.map +1 -0
- package/dist/sync/PortfolioSyncComparer.js +158 -0
- package/dist/tools/getWelcomeMessage.d.ts +41 -0
- package/dist/tools/getWelcomeMessage.d.ts.map +1 -0
- package/dist/tools/getWelcomeMessage.js +109 -0
- package/dist/utils/TemplateRenderer.d.ts +63 -0
- package/dist/utils/TemplateRenderer.d.ts.map +1 -0
- package/dist/utils/TemplateRenderer.js +154 -0
- package/package.json +1 -1
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* PortfolioDownloader - Downloads elements from GitHub repositories
|
|
3
|
+
*
|
|
4
|
+
* Handles fetching file contents from GitHub, decoding base64 content,
|
|
5
|
+
* and returning structured element data ready for local storage.
|
|
6
|
+
*/
|
|
7
|
+
import { logger } from '../utils/logger.js';
|
|
8
|
+
import { UnicodeValidator } from '../security/validators/unicodeValidator.js';
|
|
9
|
+
export class PortfolioDownloader {
|
|
10
|
+
/**
|
|
11
|
+
* Download an element from GitHub
|
|
12
|
+
*/
|
|
13
|
+
async downloadFromGitHub(repoManager, elementPath, username, repository) {
|
|
14
|
+
try {
|
|
15
|
+
logger.info('Downloading element from GitHub', {
|
|
16
|
+
path: elementPath,
|
|
17
|
+
username,
|
|
18
|
+
repository
|
|
19
|
+
});
|
|
20
|
+
// Fetch the file content from GitHub
|
|
21
|
+
const response = await repoManager.githubRequest(`/repos/${username}/${repository}/contents/${elementPath}`);
|
|
22
|
+
if (!response || !response.content) {
|
|
23
|
+
throw new Error(`No content found at path: ${elementPath}`);
|
|
24
|
+
}
|
|
25
|
+
// Decode base64 content
|
|
26
|
+
const decodedContent = Buffer.from(response.content, 'base64').toString('utf-8');
|
|
27
|
+
// Normalize Unicode for security
|
|
28
|
+
const normalized = UnicodeValidator.normalize(decodedContent);
|
|
29
|
+
// Log download for audit trail
|
|
30
|
+
logger.info('Element downloaded successfully', {
|
|
31
|
+
path: elementPath,
|
|
32
|
+
repository: `${username}/${repository}`,
|
|
33
|
+
sha: response.sha
|
|
34
|
+
});
|
|
35
|
+
// Parse metadata from frontmatter if present
|
|
36
|
+
const metadata = this.extractMetadata(normalized.normalizedContent);
|
|
37
|
+
return {
|
|
38
|
+
content: normalized.normalizedContent,
|
|
39
|
+
metadata,
|
|
40
|
+
sha: response.sha
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
catch (error) {
|
|
44
|
+
logger.error('Failed to download element from GitHub', {
|
|
45
|
+
error,
|
|
46
|
+
path: elementPath
|
|
47
|
+
});
|
|
48
|
+
// Re-throw with more context
|
|
49
|
+
if (error instanceof Error) {
|
|
50
|
+
if (error.message.includes('404')) {
|
|
51
|
+
throw new Error(`Element not found at path: ${elementPath}`);
|
|
52
|
+
}
|
|
53
|
+
if (error.message.includes('401') || error.message.includes('403')) {
|
|
54
|
+
throw new Error(`Authentication failed. Please check your GitHub token.`);
|
|
55
|
+
}
|
|
56
|
+
throw error;
|
|
57
|
+
}
|
|
58
|
+
throw new Error(`Failed to download ${elementPath}: ${String(error)}`);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* Extract metadata from frontmatter
|
|
63
|
+
*/
|
|
64
|
+
extractMetadata(content) {
|
|
65
|
+
const metadata = {};
|
|
66
|
+
// Check for YAML frontmatter
|
|
67
|
+
const frontmatterMatch = content.match(/^---\n([\s\S]*?)\n---/);
|
|
68
|
+
if (frontmatterMatch) {
|
|
69
|
+
try {
|
|
70
|
+
// Parse the frontmatter as simple key-value pairs
|
|
71
|
+
// (avoiding using yaml.load for security)
|
|
72
|
+
const frontmatterContent = frontmatterMatch[1];
|
|
73
|
+
const lines = frontmatterContent.split('\n');
|
|
74
|
+
for (const line of lines) {
|
|
75
|
+
const colonIndex = line.indexOf(':');
|
|
76
|
+
if (colonIndex > 0) {
|
|
77
|
+
const key = line.substring(0, colonIndex).trim();
|
|
78
|
+
const value = line.substring(colonIndex + 1).trim();
|
|
79
|
+
// Remove quotes if present
|
|
80
|
+
const cleanValue = value.replace(/^["']|["']$/g, '');
|
|
81
|
+
// Try to parse as JSON for arrays/objects, otherwise use as string
|
|
82
|
+
try {
|
|
83
|
+
metadata[key] = JSON.parse(cleanValue);
|
|
84
|
+
}
|
|
85
|
+
catch {
|
|
86
|
+
metadata[key] = cleanValue;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
catch (error) {
|
|
92
|
+
logger.warn('Failed to parse frontmatter metadata', { error });
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
return metadata;
|
|
96
|
+
}
|
|
97
|
+
/**
|
|
98
|
+
* Download multiple elements in batch
|
|
99
|
+
*/
|
|
100
|
+
async downloadBatch(repoManager, elementPaths, username, repository, onProgress) {
|
|
101
|
+
const results = new Map();
|
|
102
|
+
let downloaded = 0;
|
|
103
|
+
for (const path of elementPaths) {
|
|
104
|
+
try {
|
|
105
|
+
const elementData = await this.downloadFromGitHub(repoManager, path, username, repository);
|
|
106
|
+
results.set(path, elementData);
|
|
107
|
+
downloaded++;
|
|
108
|
+
if (onProgress) {
|
|
109
|
+
onProgress(downloaded, elementPaths.length);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
catch (error) {
|
|
113
|
+
logger.error(`Failed to download ${path}`, { error });
|
|
114
|
+
// Continue with other downloads even if one fails
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
return results;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PortfolioDownloader.js","sourceRoot":"","sources":["../../src/sync/PortfolioDownloader.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * PortfolioDownloader - Downloads elements from GitHub repositories\n * \n * Handles fetching file contents from GitHub, decoding base64 content,\n * and returning structured element data ready for local storage.\n */\n\nimport { PortfolioRepoManager } from '../portfolio/PortfolioRepoManager.js';\nimport { logger } from '../utils/logger.js';\nimport { UnicodeValidator } from '../security/validators/unicodeValidator.js';\n\nexport interface ElementData {\n  content: string;\n  metadata: Record<string, any>;\n  sha: string;\n}\n\nexport class PortfolioDownloader {\n  /**\n   * Download an element from GitHub\n   */\n  async downloadFromGitHub(\n    repoManager: PortfolioRepoManager,\n    elementPath: string,\n    username: string,\n    repository: string\n  ): Promise<ElementData> {\n    try {\n      logger.info('Downloading element from GitHub', { \n        path: elementPath, \n        username, \n        repository \n      });\n\n      // Fetch the file content from GitHub\n      const response = await repoManager.githubRequest(\n        `/repos/${username}/${repository}/contents/${elementPath}`\n      );\n\n      if (!response || !response.content) {\n        throw new Error(`No content found at path: ${elementPath}`);\n      }\n\n      // Decode base64 content\n      const decodedContent = Buffer.from(response.content, 'base64').toString('utf-8');\n      \n      // Normalize Unicode for security\n      const normalized = UnicodeValidator.normalize(decodedContent);\n      \n      // Log download for audit trail\n      logger.info('Element downloaded successfully', {\n        path: elementPath,\n        repository: `${username}/${repository}`,\n        sha: response.sha\n      });\n\n      // Parse metadata from frontmatter if present\n      const metadata = this.extractMetadata(normalized.normalizedContent);\n\n      return {\n        content: normalized.normalizedContent,\n        metadata,\n        sha: response.sha\n      };\n      \n    } catch (error) {\n      logger.error('Failed to download element from GitHub', { \n        error, \n        path: elementPath \n      });\n      \n      // Re-throw with more context\n      if (error instanceof Error) {\n        if (error.message.includes('404')) {\n          throw new Error(`Element not found at path: ${elementPath}`);\n        }\n        if (error.message.includes('401') || error.message.includes('403')) {\n          throw new Error(`Authentication failed. Please check your GitHub token.`);\n        }\n        throw error;\n      }\n      \n      throw new Error(`Failed to download ${elementPath}: ${String(error)}`);\n    }\n  }\n\n  /**\n   * Extract metadata from frontmatter\n   */\n  private extractMetadata(content: string): Record<string, any> {\n    const metadata: Record<string, any> = {};\n    \n    // Check for YAML frontmatter\n    const frontmatterMatch = content.match(/^---\\n([\\s\\S]*?)\\n---/);\n    \n    if (frontmatterMatch) {\n      try {\n        // Parse the frontmatter as simple key-value pairs\n        // (avoiding using yaml.load for security)\n        const frontmatterContent = frontmatterMatch[1];\n        const lines = frontmatterContent.split('\\n');\n        \n        for (const line of lines) {\n          const colonIndex = line.indexOf(':');\n          if (colonIndex > 0) {\n            const key = line.substring(0, colonIndex).trim();\n            const value = line.substring(colonIndex + 1).trim();\n            \n            // Remove quotes if present\n            const cleanValue = value.replace(/^[\"']|[\"']$/g, '');\n            \n            // Try to parse as JSON for arrays/objects, otherwise use as string\n            try {\n              metadata[key] = JSON.parse(cleanValue);\n            } catch {\n              metadata[key] = cleanValue;\n            }\n          }\n        }\n      } catch (error) {\n        logger.warn('Failed to parse frontmatter metadata', { error });\n      }\n    }\n    \n    return metadata;\n  }\n\n  /**\n   * Download multiple elements in batch\n   */\n  async downloadBatch(\n    repoManager: PortfolioRepoManager,\n    elementPaths: string[],\n    username: string,\n    repository: string,\n    onProgress?: (downloaded: number, total: number) => void\n  ): Promise<Map<string, ElementData>> {\n    const results = new Map<string, ElementData>();\n    let downloaded = 0;\n    \n    for (const path of elementPaths) {\n      try {\n        const elementData = await this.downloadFromGitHub(\n          repoManager,\n          path,\n          username,\n          repository\n        );\n        \n        results.set(path, elementData);\n        downloaded++;\n        \n        if (onProgress) {\n          onProgress(downloaded, elementPaths.length);\n        }\n      } catch (error) {\n        logger.error(`Failed to download ${path}`, { error });\n        // Continue with other downloads even if one fails\n      }\n    }\n    \n    return results;\n  }\n}"]}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* PortfolioSyncComparer - Compares local and GitHub portfolio elements
|
|
3
|
+
*
|
|
4
|
+
* Determines what actions need to be taken based on the sync mode:
|
|
5
|
+
* - additive: Only add missing elements
|
|
6
|
+
* - mirror: Make local exactly match GitHub
|
|
7
|
+
* - backup: Treat GitHub as authoritative source
|
|
8
|
+
*/
|
|
9
|
+
import { ElementType } from '../portfolio/types.js';
|
|
10
|
+
import { GitHubIndexEntry } from '../portfolio/GitHubPortfolioIndexer.js';
|
|
11
|
+
export type SyncMode = 'additive' | 'mirror' | 'backup';
|
|
12
|
+
export interface SyncAction {
|
|
13
|
+
type: ElementType;
|
|
14
|
+
name: string;
|
|
15
|
+
path: string;
|
|
16
|
+
action: 'add' | 'update' | 'delete' | 'skip';
|
|
17
|
+
reason?: string;
|
|
18
|
+
localSha?: string;
|
|
19
|
+
remoteSha?: string;
|
|
20
|
+
}
|
|
21
|
+
export interface SyncActions {
|
|
22
|
+
toAdd: SyncAction[];
|
|
23
|
+
toUpdate: SyncAction[];
|
|
24
|
+
toDelete: SyncAction[];
|
|
25
|
+
toSkip: SyncAction[];
|
|
26
|
+
}
|
|
27
|
+
export declare class PortfolioSyncComparer {
|
|
28
|
+
/**
|
|
29
|
+
* Compare GitHub and local elements to determine sync actions
|
|
30
|
+
*/
|
|
31
|
+
compareElements(githubElements: Map<ElementType, GitHubIndexEntry[]>, localElements: Map<ElementType, any[]>, mode: SyncMode): SyncActions;
|
|
32
|
+
/**
|
|
33
|
+
* Compare elements of a specific type
|
|
34
|
+
*/
|
|
35
|
+
private compareTypeElements;
|
|
36
|
+
/**
|
|
37
|
+
* Determine if an element should be updated
|
|
38
|
+
*/
|
|
39
|
+
private shouldUpdate;
|
|
40
|
+
/**
|
|
41
|
+
* Normalize element name for comparison
|
|
42
|
+
* Handles different naming formats and extensions
|
|
43
|
+
*/
|
|
44
|
+
private normalizeElementName;
|
|
45
|
+
/**
|
|
46
|
+
* Count total elements in a map
|
|
47
|
+
*/
|
|
48
|
+
private countElements;
|
|
49
|
+
}
|
|
50
|
+
//# sourceMappingURL=PortfolioSyncComparer.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PortfolioSyncComparer.d.ts","sourceRoot":"","sources":["../../src/sync/PortfolioSyncComparer.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAG1E,MAAM,MAAM,QAAQ,GAAG,UAAU,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAExD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,KAAK,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC7C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,QAAQ,EAAE,UAAU,EAAE,CAAC;IACvB,QAAQ,EAAE,UAAU,EAAE,CAAC;IACvB,MAAM,EAAE,UAAU,EAAE,CAAC;CACtB;AAED,qBAAa,qBAAqB;IAChC;;OAEG;IACH,eAAe,CACb,cAAc,EAAE,GAAG,CAAC,WAAW,EAAE,gBAAgB,EAAE,CAAC,EACpD,aAAa,EAAE,GAAG,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,EACtC,IAAI,EAAE,QAAQ,GACb,WAAW;IA2Cd;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAuE3B;;OAEG;IACH,OAAO,CAAC,YAAY;IAgCpB;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAe5B;;OAEG;IACH,OAAO,CAAC,aAAa;CAOtB"}
|
|
@@ -0,0 +1,158 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* PortfolioSyncComparer - Compares local and GitHub portfolio elements
|
|
3
|
+
*
|
|
4
|
+
* Determines what actions need to be taken based on the sync mode:
|
|
5
|
+
* - additive: Only add missing elements
|
|
6
|
+
* - mirror: Make local exactly match GitHub
|
|
7
|
+
* - backup: Treat GitHub as authoritative source
|
|
8
|
+
*/
|
|
9
|
+
import { logger } from '../utils/logger.js';
|
|
10
|
+
export class PortfolioSyncComparer {
|
|
11
|
+
/**
|
|
12
|
+
* Compare GitHub and local elements to determine sync actions
|
|
13
|
+
*/
|
|
14
|
+
compareElements(githubElements, localElements, mode) {
|
|
15
|
+
const actions = {
|
|
16
|
+
toAdd: [],
|
|
17
|
+
toUpdate: [],
|
|
18
|
+
toDelete: [],
|
|
19
|
+
toSkip: []
|
|
20
|
+
};
|
|
21
|
+
logger.info('Comparing elements', {
|
|
22
|
+
githubCount: this.countElements(githubElements),
|
|
23
|
+
localCount: this.countElements(localElements),
|
|
24
|
+
mode
|
|
25
|
+
});
|
|
26
|
+
// Process each element type
|
|
27
|
+
const allTypes = new Set([
|
|
28
|
+
...githubElements.keys(),
|
|
29
|
+
...localElements.keys()
|
|
30
|
+
]);
|
|
31
|
+
for (const type of allTypes) {
|
|
32
|
+
const githubTypeElements = githubElements.get(type) || [];
|
|
33
|
+
const localTypeElements = localElements.get(type) || [];
|
|
34
|
+
this.compareTypeElements(type, githubTypeElements, localTypeElements, mode, actions);
|
|
35
|
+
}
|
|
36
|
+
logger.info('Comparison complete', {
|
|
37
|
+
toAdd: actions.toAdd.length,
|
|
38
|
+
toUpdate: actions.toUpdate.length,
|
|
39
|
+
toDelete: actions.toDelete.length,
|
|
40
|
+
toSkip: actions.toSkip.length
|
|
41
|
+
});
|
|
42
|
+
return actions;
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Compare elements of a specific type
|
|
46
|
+
*/
|
|
47
|
+
compareTypeElements(type, githubElements, localElements, mode, actions) {
|
|
48
|
+
// Create maps for efficient lookup
|
|
49
|
+
const githubMap = new Map(githubElements.map(e => [this.normalizeElementName(e.name), e]));
|
|
50
|
+
const localMap = new Map(localElements.map(e => [this.normalizeElementName(e.name || e.metadata?.name), e]));
|
|
51
|
+
// Process GitHub elements (additions and updates)
|
|
52
|
+
for (const [name, githubElement] of githubMap) {
|
|
53
|
+
const localElement = localMap.get(name);
|
|
54
|
+
if (!localElement) {
|
|
55
|
+
// Element exists on GitHub but not locally
|
|
56
|
+
actions.toAdd.push({
|
|
57
|
+
type,
|
|
58
|
+
name: githubElement.name,
|
|
59
|
+
path: githubElement.path,
|
|
60
|
+
action: 'add',
|
|
61
|
+
remoteSha: githubElement.sha
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
else if (mode === 'backup' || this.shouldUpdate(githubElement, localElement, mode)) {
|
|
65
|
+
// Element needs updating
|
|
66
|
+
actions.toUpdate.push({
|
|
67
|
+
type,
|
|
68
|
+
name: githubElement.name,
|
|
69
|
+
path: githubElement.path,
|
|
70
|
+
action: 'update',
|
|
71
|
+
reason: mode === 'backup' ? 'backup mode' : 'newer on GitHub',
|
|
72
|
+
localSha: localElement.sha,
|
|
73
|
+
remoteSha: githubElement.sha
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
// Element is up to date or should be skipped
|
|
78
|
+
actions.toSkip.push({
|
|
79
|
+
type,
|
|
80
|
+
name: githubElement.name,
|
|
81
|
+
path: githubElement.path,
|
|
82
|
+
action: 'skip',
|
|
83
|
+
reason: 'up to date',
|
|
84
|
+
localSha: localElement.sha,
|
|
85
|
+
remoteSha: githubElement.sha
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
// Process local elements (deletions - only in mirror mode)
|
|
90
|
+
if (mode === 'mirror') {
|
|
91
|
+
for (const [name, localElement] of localMap) {
|
|
92
|
+
if (!githubMap.has(name)) {
|
|
93
|
+
// Element exists locally but not on GitHub
|
|
94
|
+
actions.toDelete.push({
|
|
95
|
+
type,
|
|
96
|
+
name: localElement.name || localElement.metadata?.name || name,
|
|
97
|
+
path: `${type}/${name}.md`,
|
|
98
|
+
action: 'delete',
|
|
99
|
+
reason: 'not on GitHub',
|
|
100
|
+
localSha: localElement.sha
|
|
101
|
+
});
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
/**
|
|
107
|
+
* Determine if an element should be updated
|
|
108
|
+
*/
|
|
109
|
+
shouldUpdate(githubElement, localElement, mode) {
|
|
110
|
+
// In backup mode, always update from GitHub
|
|
111
|
+
if (mode === 'backup') {
|
|
112
|
+
return true;
|
|
113
|
+
}
|
|
114
|
+
// In additive mode, never update existing elements
|
|
115
|
+
if (mode === 'additive') {
|
|
116
|
+
return false;
|
|
117
|
+
}
|
|
118
|
+
// In mirror mode, update if SHAs differ
|
|
119
|
+
// If we don't have SHAs, compare modified dates
|
|
120
|
+
if (githubElement.sha && localElement.sha) {
|
|
121
|
+
return githubElement.sha !== localElement.sha;
|
|
122
|
+
}
|
|
123
|
+
// Compare modified dates if available
|
|
124
|
+
if (githubElement.lastModified && localElement.lastModified) {
|
|
125
|
+
const githubDate = new Date(githubElement.lastModified).getTime();
|
|
126
|
+
const localDate = new Date(localElement.lastModified).getTime();
|
|
127
|
+
return githubDate > localDate;
|
|
128
|
+
}
|
|
129
|
+
// If we can't determine, skip updating in mirror mode
|
|
130
|
+
return false;
|
|
131
|
+
}
|
|
132
|
+
/**
|
|
133
|
+
* Normalize element name for comparison
|
|
134
|
+
* Handles different naming formats and extensions
|
|
135
|
+
*/
|
|
136
|
+
normalizeElementName(name) {
|
|
137
|
+
if (!name)
|
|
138
|
+
return '';
|
|
139
|
+
// Remove .md extension if present
|
|
140
|
+
let normalized = name.replace(/\.md$/i, '');
|
|
141
|
+
// Convert to lowercase for comparison
|
|
142
|
+
normalized = normalized.toLowerCase();
|
|
143
|
+
// Replace spaces with hyphens (some systems use different formats)
|
|
144
|
+
normalized = normalized.replace(/\s+/g, '-');
|
|
145
|
+
return normalized;
|
|
146
|
+
}
|
|
147
|
+
/**
|
|
148
|
+
* Count total elements in a map
|
|
149
|
+
*/
|
|
150
|
+
countElements(elements) {
|
|
151
|
+
let count = 0;
|
|
152
|
+
for (const typeElements of elements.values()) {
|
|
153
|
+
count += typeElements.length;
|
|
154
|
+
}
|
|
155
|
+
return count;
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PortfolioSyncComparer.js","sourceRoot":"","sources":["../../src/sync/PortfolioSyncComparer.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * PortfolioSyncComparer - Compares local and GitHub portfolio elements\n * \n * Determines what actions need to be taken based on the sync mode:\n * - additive: Only add missing elements\n * - mirror: Make local exactly match GitHub\n * - backup: Treat GitHub as authoritative source\n */\n\nimport { ElementType } from '../portfolio/types.js';\nimport { GitHubIndexEntry } from '../portfolio/GitHubPortfolioIndexer.js';\nimport { logger } from '../utils/logger.js';\n\nexport type SyncMode = 'additive' | 'mirror' | 'backup';\n\nexport interface SyncAction {\n  type: ElementType;\n  name: string;\n  path: string;\n  action: 'add' | 'update' | 'delete' | 'skip';\n  reason?: string;\n  localSha?: string;\n  remoteSha?: string;\n}\n\nexport interface SyncActions {\n  toAdd: SyncAction[];\n  toUpdate: SyncAction[];\n  toDelete: SyncAction[];\n  toSkip: SyncAction[];\n}\n\nexport class PortfolioSyncComparer {\n  /**\n   * Compare GitHub and local elements to determine sync actions\n   */\n  compareElements(\n    githubElements: Map<ElementType, GitHubIndexEntry[]>,\n    localElements: Map<ElementType, any[]>,\n    mode: SyncMode\n  ): SyncActions {\n    const actions: SyncActions = {\n      toAdd: [],\n      toUpdate: [],\n      toDelete: [],\n      toSkip: []\n    };\n\n    logger.info('Comparing elements', { \n      githubCount: this.countElements(githubElements),\n      localCount: this.countElements(localElements),\n      mode \n    });\n\n    // Process each element type\n    const allTypes = new Set([\n      ...githubElements.keys(),\n      ...localElements.keys()\n    ]);\n\n    for (const type of allTypes) {\n      const githubTypeElements = githubElements.get(type) || [];\n      const localTypeElements = localElements.get(type) || [];\n      \n      this.compareTypeElements(\n        type,\n        githubTypeElements,\n        localTypeElements,\n        mode,\n        actions\n      );\n    }\n\n    logger.info('Comparison complete', {\n      toAdd: actions.toAdd.length,\n      toUpdate: actions.toUpdate.length,\n      toDelete: actions.toDelete.length,\n      toSkip: actions.toSkip.length\n    });\n\n    return actions;\n  }\n\n  /**\n   * Compare elements of a specific type\n   */\n  private compareTypeElements(\n    type: ElementType,\n    githubElements: GitHubIndexEntry[],\n    localElements: any[],\n    mode: SyncMode,\n    actions: SyncActions\n  ): void {\n    // Create maps for efficient lookup\n    const githubMap = new Map(\n      githubElements.map(e => [this.normalizeElementName(e.name), e])\n    );\n    const localMap = new Map(\n      localElements.map(e => [this.normalizeElementName(e.name || e.metadata?.name), e])\n    );\n\n    // Process GitHub elements (additions and updates)\n    for (const [name, githubElement] of githubMap) {\n      const localElement = localMap.get(name);\n      \n      if (!localElement) {\n        // Element exists on GitHub but not locally\n        actions.toAdd.push({\n          type,\n          name: githubElement.name,\n          path: githubElement.path,\n          action: 'add',\n          remoteSha: githubElement.sha\n        });\n      } else if (mode === 'backup' || this.shouldUpdate(githubElement, localElement, mode)) {\n        // Element needs updating\n        actions.toUpdate.push({\n          type,\n          name: githubElement.name,\n          path: githubElement.path,\n          action: 'update',\n          reason: mode === 'backup' ? 'backup mode' : 'newer on GitHub',\n          localSha: localElement.sha,\n          remoteSha: githubElement.sha\n        });\n      } else {\n        // Element is up to date or should be skipped\n        actions.toSkip.push({\n          type,\n          name: githubElement.name,\n          path: githubElement.path,\n          action: 'skip',\n          reason: 'up to date',\n          localSha: localElement.sha,\n          remoteSha: githubElement.sha\n        });\n      }\n    }\n\n    // Process local elements (deletions - only in mirror mode)\n    if (mode === 'mirror') {\n      for (const [name, localElement] of localMap) {\n        if (!githubMap.has(name)) {\n          // Element exists locally but not on GitHub\n          actions.toDelete.push({\n            type,\n            name: localElement.name || localElement.metadata?.name || name,\n            path: `${type}/${name}.md`,\n            action: 'delete',\n            reason: 'not on GitHub',\n            localSha: localElement.sha\n          });\n        }\n      }\n    }\n  }\n\n  /**\n   * Determine if an element should be updated\n   */\n  private shouldUpdate(\n    githubElement: GitHubIndexEntry,\n    localElement: any,\n    mode: SyncMode\n  ): boolean {\n    // In backup mode, always update from GitHub\n    if (mode === 'backup') {\n      return true;\n    }\n\n    // In additive mode, never update existing elements\n    if (mode === 'additive') {\n      return false;\n    }\n\n    // In mirror mode, update if SHAs differ\n    // If we don't have SHAs, compare modified dates\n    if (githubElement.sha && localElement.sha) {\n      return githubElement.sha !== localElement.sha;\n    }\n\n    // Compare modified dates if available\n    if (githubElement.lastModified && localElement.lastModified) {\n      const githubDate = new Date(githubElement.lastModified).getTime();\n      const localDate = new Date(localElement.lastModified).getTime();\n      return githubDate > localDate;\n    }\n\n    // If we can't determine, skip updating in mirror mode\n    return false;\n  }\n\n  /**\n   * Normalize element name for comparison\n   * Handles different naming formats and extensions\n   */\n  private normalizeElementName(name: string): string {\n    if (!name) return '';\n    \n    // Remove .md extension if present\n    let normalized = name.replace(/\\.md$/i, '');\n    \n    // Convert to lowercase for comparison\n    normalized = normalized.toLowerCase();\n    \n    // Replace spaces with hyphens (some systems use different formats)\n    normalized = normalized.replace(/\\s+/g, '-');\n    \n    return normalized;\n  }\n\n  /**\n   * Count total elements in a map\n   */\n  private countElements(elements: Map<ElementType, any[]>): number {\n    let count = 0;\n    for (const typeElements of elements.values()) {\n      count += typeElements.length;\n    }\n    return count;\n  }\n}"]}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Get Welcome Message Tool
|
|
3
|
+
*
|
|
4
|
+
* A dedicated MCP tool that returns the welcome message
|
|
5
|
+
* This gives us more control over how the message is presented
|
|
6
|
+
*/
|
|
7
|
+
export interface GetWelcomeMessageOptions {
|
|
8
|
+
format?: 'text' | 'markdown' | 'raw';
|
|
9
|
+
skipCheck?: boolean;
|
|
10
|
+
}
|
|
11
|
+
export declare class GetWelcomeMessageTool {
|
|
12
|
+
private configManager;
|
|
13
|
+
constructor();
|
|
14
|
+
/**
|
|
15
|
+
* Get the welcome message directly as a tool response
|
|
16
|
+
* This bypasses the response wrapping and gives us full control
|
|
17
|
+
*/
|
|
18
|
+
execute(options?: GetWelcomeMessageOptions): Promise<any>;
|
|
19
|
+
/**
|
|
20
|
+
* Tool definition for MCP
|
|
21
|
+
*/
|
|
22
|
+
static get definition(): {
|
|
23
|
+
name: string;
|
|
24
|
+
description: string;
|
|
25
|
+
inputSchema: {
|
|
26
|
+
type: string;
|
|
27
|
+
properties: {
|
|
28
|
+
format: {
|
|
29
|
+
type: string;
|
|
30
|
+
enum: string[];
|
|
31
|
+
description: string;
|
|
32
|
+
};
|
|
33
|
+
skipCheck: {
|
|
34
|
+
type: string;
|
|
35
|
+
description: string;
|
|
36
|
+
};
|
|
37
|
+
};
|
|
38
|
+
};
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=getWelcomeMessage.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getWelcomeMessage.d.ts","sourceRoot":"","sources":["../../src/tools/getWelcomeMessage.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,MAAM,WAAW,wBAAwB;IACvC,MAAM,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,KAAK,CAAC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,qBAAa,qBAAqB;IAChC,OAAO,CAAC,aAAa,CAAgB;;IAMrC;;;OAGG;IACG,OAAO,CAAC,OAAO,GAAE,wBAA6B,GAAG,OAAO,CAAC,GAAG,CAAC;IAsEnE;;OAEG;IACH,MAAM,KAAK,UAAU;;;;;;;;;;;;;;;;;MAmBpB;CACF"}
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Get Welcome Message Tool
|
|
3
|
+
*
|
|
4
|
+
* A dedicated MCP tool that returns the welcome message
|
|
5
|
+
* This gives us more control over how the message is presented
|
|
6
|
+
*/
|
|
7
|
+
import { ConfigManager } from '../config/ConfigManager.js';
|
|
8
|
+
export class GetWelcomeMessageTool {
|
|
9
|
+
configManager;
|
|
10
|
+
constructor() {
|
|
11
|
+
this.configManager = ConfigManager.getInstance();
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Get the welcome message directly as a tool response
|
|
15
|
+
* This bypasses the response wrapping and gives us full control
|
|
16
|
+
*/
|
|
17
|
+
async execute(options = {}) {
|
|
18
|
+
await this.configManager.initialize();
|
|
19
|
+
const config = this.configManager.getConfig();
|
|
20
|
+
// Check if we should show the welcome message
|
|
21
|
+
if (!options.skipCheck) {
|
|
22
|
+
if (config.wizard?.completed || config.wizard?.dismissed) {
|
|
23
|
+
return {
|
|
24
|
+
content: [{
|
|
25
|
+
type: "text",
|
|
26
|
+
text: "Welcome back to DollhouseMCP! The wizard has already been completed. Use 'Open configuration wizard' if you want to reconfigure."
|
|
27
|
+
}]
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
const welcomeMessage = `🎨 **Welcome to DollhouseMCP!**
|
|
32
|
+
|
|
33
|
+
Hi there! I see this is your first time here. DollhouseMCP helps you create powerful customization elements for your AI assistant - and it's easier than you might think!
|
|
34
|
+
|
|
35
|
+
**What can you do with DollhouseMCP?**
|
|
36
|
+
|
|
37
|
+
🎭 **Personas** - Change your AI's personality (make it funny, professional, creative, or anything you imagine)
|
|
38
|
+
💡 **Skills** - Give your AI new abilities like taking meeting notes, reviewing code, or organizing your thoughts
|
|
39
|
+
📝 **Templates** - Create reusable formats for emails, documentation, resumes, and more
|
|
40
|
+
🤖 **Agents** - Build smart assistants that handle specific tasks automatically
|
|
41
|
+
✨ **And more!** - Just describe what you want, and DollhouseMCP will help you create it
|
|
42
|
+
|
|
43
|
+
The best part? Everything you create is saved and persistent. Your custom tools and assistants will be there whenever you need them. You can modify them anytime just by asking!
|
|
44
|
+
|
|
45
|
+
**Need ideas?** Just ask "What would be the best way to..." and I'll help you figure out the perfect solution.
|
|
46
|
+
|
|
47
|
+
**Ready to get started?** I'll help you:
|
|
48
|
+
- Choose a username (this tags your creations so you can find them later - or stay anonymous, that's totally fine!)
|
|
49
|
+
- Set up your workspace for saving all your customizations
|
|
50
|
+
- Browse examples to spark your creativity
|
|
51
|
+
- Create your first customization element
|
|
52
|
+
|
|
53
|
+
Just say:
|
|
54
|
+
- "Yes" or "Let's get started" → I'll guide you through setup
|
|
55
|
+
- "Skip for now" → You can set up later when you're ready
|
|
56
|
+
- "I'll stay anonymous" → Perfect! You can use everything without signing in
|
|
57
|
+
|
|
58
|
+
**What's a username for?** It simply tags your creations (like "created by: you") so you can find them easily. Staying anonymous means your creations are tagged with a fun random ID instead (like "created by: clever-fox"). Either way, all your work is saved locally on your computer!
|
|
59
|
+
|
|
60
|
+
Don't worry - this only takes a minute, and you can change any settings later! 🌟`;
|
|
61
|
+
// Return the message in the requested format
|
|
62
|
+
if (options.format === 'raw') {
|
|
63
|
+
// Just the text, no formatting
|
|
64
|
+
return welcomeMessage;
|
|
65
|
+
}
|
|
66
|
+
else if (options.format === 'markdown') {
|
|
67
|
+
// Return as markdown code block
|
|
68
|
+
return {
|
|
69
|
+
content: [{
|
|
70
|
+
type: "text",
|
|
71
|
+
text: "```markdown\n" + welcomeMessage + "\n```"
|
|
72
|
+
}]
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
// Default: Return as clean text with instruction
|
|
77
|
+
return {
|
|
78
|
+
content: [{
|
|
79
|
+
type: "text",
|
|
80
|
+
text: welcomeMessage
|
|
81
|
+
}]
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
/**
|
|
86
|
+
* Tool definition for MCP
|
|
87
|
+
*/
|
|
88
|
+
static get definition() {
|
|
89
|
+
return {
|
|
90
|
+
name: "dollhouse_welcome",
|
|
91
|
+
description: "Get the DollhouseMCP welcome message for first-time users",
|
|
92
|
+
inputSchema: {
|
|
93
|
+
type: "object",
|
|
94
|
+
properties: {
|
|
95
|
+
format: {
|
|
96
|
+
type: "string",
|
|
97
|
+
enum: ["text", "markdown", "raw"],
|
|
98
|
+
description: "Format for the welcome message (default: text)"
|
|
99
|
+
},
|
|
100
|
+
skipCheck: {
|
|
101
|
+
type: "boolean",
|
|
102
|
+
description: "Skip checking if wizard was already completed (default: false)"
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
};
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"getWelcomeMessage.js","sourceRoot":"","sources":["../../src/tools/getWelcomeMessage.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAO3D,MAAM,OAAO,qBAAqB;IACxB,aAAa,CAAgB;IAErC;QACE,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC;IACnD,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,OAAO,CAAC,UAAoC,EAAE;QAClD,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;QAE9C,8CAA8C;QAC9C,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;YACvB,IAAI,MAAM,CAAC,MAAM,EAAE,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC;gBACzD,OAAO;oBACL,OAAO,EAAE,CAAC;4BACR,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,kIAAkI;yBACzI,CAAC;iBACH,CAAC;YACJ,CAAC;QACH,CAAC;QAED,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kFA6BuD,CAAC;QAE/E,6CAA6C;QAC7C,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YAC7B,+BAA+B;YAC/B,OAAO,cAAc,CAAC;QACxB,CAAC;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YACzC,gCAAgC;YAChC,OAAO;gBACL,OAAO,EAAE,CAAC;wBACR,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,eAAe,GAAG,cAAc,GAAG,OAAO;qBACjD,CAAC;aACH,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,iDAAiD;YACjD,OAAO;gBACL,OAAO,EAAE,CAAC;wBACR,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,cAAc;qBACrB,CAAC;aACH,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;OAEG;IACH,MAAM,KAAK,UAAU;QACnB,OAAO;YACL,IAAI,EAAE,mBAAmB;YACzB,WAAW,EAAE,2DAA2D;YACxE,WAAW,EAAE;gBACX,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,MAAM,EAAE;wBACN,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC;wBACjC,WAAW,EAAE,gDAAgD;qBAC9D;oBACD,SAAS,EAAE;wBACT,IAAI,EAAE,SAAS;wBACf,WAAW,EAAE,gEAAgE;qBAC9E;iBACF;aACF;SACF,CAAC;IACJ,CAAC;CACF","sourcesContent":["/**\n * Get Welcome Message Tool\n * \n * A dedicated MCP tool that returns the welcome message\n * This gives us more control over how the message is presented\n */\n\nimport { ConfigManager } from '../config/ConfigManager.js';\n\nexport interface GetWelcomeMessageOptions {\n  format?: 'text' | 'markdown' | 'raw';\n  skipCheck?: boolean;\n}\n\nexport class GetWelcomeMessageTool {\n  private configManager: ConfigManager;\n  \n  constructor() {\n    this.configManager = ConfigManager.getInstance();\n  }\n  \n  /**\n   * Get the welcome message directly as a tool response\n   * This bypasses the response wrapping and gives us full control\n   */\n  async execute(options: GetWelcomeMessageOptions = {}): Promise<any> {\n    await this.configManager.initialize();\n    const config = this.configManager.getConfig();\n    \n    // Check if we should show the welcome message\n    if (!options.skipCheck) {\n      if (config.wizard?.completed || config.wizard?.dismissed) {\n        return {\n          content: [{\n            type: \"text\",\n            text: \"Welcome back to DollhouseMCP! The wizard has already been completed. Use 'Open configuration wizard' if you want to reconfigure.\"\n          }]\n        };\n      }\n    }\n    \n    const welcomeMessage = `🎨 **Welcome to DollhouseMCP!**\n\nHi there! I see this is your first time here. DollhouseMCP helps you create powerful customization elements for your AI assistant - and it's easier than you might think!\n\n**What can you do with DollhouseMCP?**\n\n🎭 **Personas** - Change your AI's personality (make it funny, professional, creative, or anything you imagine)\n💡 **Skills** - Give your AI new abilities like taking meeting notes, reviewing code, or organizing your thoughts\n📝 **Templates** - Create reusable formats for emails, documentation, resumes, and more\n🤖 **Agents** - Build smart assistants that handle specific tasks automatically\n✨ **And more!** - Just describe what you want, and DollhouseMCP will help you create it\n\nThe best part? Everything you create is saved and persistent. Your custom tools and assistants will be there whenever you need them. You can modify them anytime just by asking!\n\n**Need ideas?** Just ask \"What would be the best way to...\" and I'll help you figure out the perfect solution.\n\n**Ready to get started?** I'll help you:\n- Choose a username (this tags your creations so you can find them later - or stay anonymous, that's totally fine!)\n- Set up your workspace for saving all your customizations\n- Browse examples to spark your creativity\n- Create your first customization element\n\nJust say:\n- \"Yes\" or \"Let's get started\" → I'll guide you through setup\n- \"Skip for now\" → You can set up later when you're ready\n- \"I'll stay anonymous\" → Perfect! You can use everything without signing in\n\n**What's a username for?** It simply tags your creations (like \"created by: you\") so you can find them easily. Staying anonymous means your creations are tagged with a fun random ID instead (like \"created by: clever-fox\"). Either way, all your work is saved locally on your computer!\n\nDon't worry - this only takes a minute, and you can change any settings later! 🌟`;\n    \n    // Return the message in the requested format\n    if (options.format === 'raw') {\n      // Just the text, no formatting\n      return welcomeMessage;\n    } else if (options.format === 'markdown') {\n      // Return as markdown code block\n      return {\n        content: [{\n          type: \"text\",\n          text: \"```markdown\\n\" + welcomeMessage + \"\\n```\"\n        }]\n      };\n    } else {\n      // Default: Return as clean text with instruction\n      return {\n        content: [{\n          type: \"text\",\n          text: welcomeMessage\n        }]\n      };\n    }\n  }\n  \n  /**\n   * Tool definition for MCP\n   */\n  static get definition() {\n    return {\n      name: \"dollhouse_welcome\",\n      description: \"Get the DollhouseMCP welcome message for first-time users\",\n      inputSchema: {\n        type: \"object\",\n        properties: {\n          format: {\n            type: \"string\",\n            enum: [\"text\", \"markdown\", \"raw\"],\n            description: \"Format for the welcome message (default: text)\"\n          },\n          skipCheck: {\n            type: \"boolean\",\n            description: \"Skip checking if wizard was already completed (default: false)\"\n          }\n        }\n      }\n    };\n  }\n}"]}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* TemplateRenderer - Utility class for rendering templates with comprehensive validation
|
|
3
|
+
*
|
|
4
|
+
* IMPROVEMENTS IMPLEMENTED (per Debug Detective recommendations):
|
|
5
|
+
* 1. instanceof Template verification for type safety
|
|
6
|
+
* 2. Performance logging to track render times
|
|
7
|
+
* 3. Validation of render() return value
|
|
8
|
+
* 4. Clear separation of concerns from index.ts
|
|
9
|
+
*
|
|
10
|
+
* This addresses Issues #913 and #914 from the v1.7.3 hotfix
|
|
11
|
+
*/
|
|
12
|
+
import { TemplateManager } from '../elements/templates/TemplateManager.js';
|
|
13
|
+
export interface RenderResult {
|
|
14
|
+
success: boolean;
|
|
15
|
+
content?: string;
|
|
16
|
+
error?: string;
|
|
17
|
+
performance?: {
|
|
18
|
+
lookupTime: number;
|
|
19
|
+
renderTime: number;
|
|
20
|
+
totalTime: number;
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
export declare class TemplateRenderer {
|
|
24
|
+
private templateManager;
|
|
25
|
+
constructor(templateManager: TemplateManager);
|
|
26
|
+
/**
|
|
27
|
+
* Render a template with comprehensive validation and performance tracking
|
|
28
|
+
*
|
|
29
|
+
* VALIDATION CHAIN:
|
|
30
|
+
* 1. Unicode normalization of template name
|
|
31
|
+
* 2. Template exists in manager
|
|
32
|
+
* 3. Template is proper Template instance
|
|
33
|
+
* 4. Template has render() method
|
|
34
|
+
* 5. render() returns a string
|
|
35
|
+
*
|
|
36
|
+
* SECURITY:
|
|
37
|
+
* - Unicode normalization prevents homograph attacks
|
|
38
|
+
* - Variables are normalized by Template.render() internally
|
|
39
|
+
*
|
|
40
|
+
* PERFORMANCE TRACKING:
|
|
41
|
+
* - Lookup time (finding template)
|
|
42
|
+
* - Render time (actual rendering)
|
|
43
|
+
* - Total time (complete operation)
|
|
44
|
+
*/
|
|
45
|
+
render(name: string, variables?: Record<string, any>): Promise<RenderResult>;
|
|
46
|
+
/**
|
|
47
|
+
* Batch render multiple templates (useful for testing)
|
|
48
|
+
* SECURITY: Each template name is normalized individually
|
|
49
|
+
*/
|
|
50
|
+
renderBatch(templates: Array<{
|
|
51
|
+
name: string;
|
|
52
|
+
variables: Record<string, any>;
|
|
53
|
+
}>): Promise<Map<string, RenderResult>>;
|
|
54
|
+
/**
|
|
55
|
+
* Validate that a template can be rendered without actually rendering it
|
|
56
|
+
* SECURITY: Template name is normalized to prevent Unicode attacks
|
|
57
|
+
*/
|
|
58
|
+
validate(name: string): Promise<{
|
|
59
|
+
valid: boolean;
|
|
60
|
+
reason?: string;
|
|
61
|
+
}>;
|
|
62
|
+
}
|
|
63
|
+
//# sourceMappingURL=TemplateRenderer.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TemplateRenderer.d.ts","sourceRoot":"","sources":["../../src/utils/TemplateRenderer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAI3E,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE;QACZ,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,qBAAa,gBAAgB;IACf,OAAO,CAAC,eAAe;gBAAf,eAAe,EAAE,eAAe;IAEpD;;;;;;;;;;;;;;;;;;OAkBG;IACG,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAkGtF;;;OAGG;IACG,WAAW,CACf,SAAS,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAAE,CAAC,GACjE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAWrC;;;OAGG;IACG,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CA4B3E"}
|