@quadient/skillshare 1.3.0 → 1.5.0

package/README.md

@@ -148,6 +148,17 @@ export SKILLSHARE_TOKEN="<personal-access-token>"
 npx @quadient/skillshare whoami
 ```
 
+Register the production or local SkillShare host as a generic OAuth provider in Git Credential
+Manager 2.0.931 or newer:
+
+```bash
+skillshare git configure
+skillshare git configure local
+```
+
+Remove only the URL-scoped SkillShare registration with `skillshare git unconfigure [local]`.
+The first Git clone opens the browser login; no SkillShare personal access token needs to be created.
+
 Update recorded installs to the latest versions:
 
 ```bash
@@ -198,3 +209,11 @@ bun run publish:tui -- --otp 123456
 ```
 
 The publish script builds `tui/`, validates the packed files with `npm pack --dry-run`, and only then runs `npm publish`.
+
+## Pages applications
+
+`skillshare pages upload <directory> --slug <slug>` accepts static sites or
+Wrangler JSON/JSONC projects. The CLI bundles Worker dependencies locally; install
+them and build frontend assets before uploading. Inspect process status and logs
+with `skillshare pages runtime <slug>`. Pages are served below `/p/<slug>/`, so use
+that base path when building assets. Runtime data survives content replacement.

package/dist/index.js

@@ -1,3 +1,4 @@
+import { preparePageFiles } from './pages.js';
 import { createServer } from 'node:http';
 import { createHash, randomBytes } from 'node:crypto';
 import { spawn } from 'node:child_process';
@@ -81,6 +82,8 @@ Commands:
   pages list
   pages show <slug>
   pages upload <directory> [--slug <slug>]
+  git configure [local]
+  git unconfigure [local]
 
 Options:
   --token <token>    Bearer token for API requests (overrides SKILLSHARE_TOKEN)
@@ -106,6 +109,19 @@ async function main() {
             await logoutSession();
             return;
         }
+        case 'git': {
+            const action = options.positionals[0];
+            const baseUrl = options.positionals[1] === 'local' ? LOCAL_URL : PROD_URL;
+            if (action === 'configure') {
+                await configureGitCredentialManager(baseUrl);
+                return;
+            }
+            if (action === 'unconfigure') {
+                await unconfigureGitCredentialManager(baseUrl);
+                return;
+            }
+            throw new Error('git requires "configure [local]" or "unconfigure [local]".');
+        }
         case 'whoami':
         case 'list':
         case 'show':
@@ -265,15 +281,15 @@ async function main() {
                     if (action === 'list') {
                         const pages = await client.get('/api/pages');
                         for (const page of pages) {
-                            console.log(`${page.slug}\t${page.fileCount}\t${page.ownerDisplayName}`);
+                            console.log(`${page.slug}\t${page.kind}\t${page.fileCount}\t${page.ownerDisplayName}`);
                         }
                         return;
                     }
-                    if (action === 'show') {
+                    if (action === 'show' || action === 'runtime') {
                         const slug = options.positionals[1];
                         if (!slug)
-                            throw new Error('pages show requires <slug>');
-                        console.log(JSON.stringify(await client.get(`/api/pages/${encodeURIComponent(slug)}`), null, 2));
+                            throw new Error(`pages ${action} requires <slug>`);
+                        console.log(JSON.stringify(await client.get(`/api/pages/${encodeURIComponent(slug)}${action === 'runtime' ? '/runtime' : ''}`), null, 2));
                         return;
                     }
                     if (action === 'upload') {
@@ -296,7 +312,7 @@ async function main() {
                         }
                         return;
                     }
-                    throw new Error(`Unknown pages command '${action}'. Use list, show, or upload.`);
+                    throw new Error(`Unknown pages command '${action}'. Use list, show, runtime, or upload.`);
                 }
             }
             return;
@@ -781,17 +797,14 @@ async function loadLocalSkillContext(directory, baseUrl) {
     };
 }
 async function loadLocalPageFiles(directory) {
-    const filePlans = await collectFilePlans(directory, directory, { includeSkillMetadata: true });
+    const filePlans = await collectFilePlans(directory, directory, { includeSkillMetadata: true, pageProject: true });
     if (filePlans.length === 0) {
         throw new Error('The page directory is empty.');
     }
-    if (!filePlans.some((file) => file.relativePath === 'index.html')) {
-        throw new Error('The page directory must contain index.html at its root.');
-    }
-    const totalBytes = filePlans.reduce((sum, file) => sum + file.size, 0);
+    const files = await preparePageFiles(directory, await collectFiles(filePlans));
     return {
-        files: await collectFiles(filePlans),
-        totalBytes,
+        files,
+        totalBytes: files.reduce((sum, file) => sum + file.content.length, 0),
     };
 }
 async function createSkillFromDirectory(client, localSkill, input) {
@@ -1328,6 +1341,66 @@ async function login(baseUrl) {
     });
     console.log(`Logged in as ${response.user.displayName} (${baseUrl})`);
 }
+const GCM_MINIMUM_VERSION = [2, 0, 931];
+async function configureGitCredentialManager(baseUrl) {
+    baseUrl = normalizeBaseUrl(baseUrl);
+    const versionResult = await runProcess('git', ['credential-manager', '--version'], { allowFailure: true });
+    const version = parseVersion(`${versionResult.stdout} ${versionResult.stderr}`);
+    if (versionResult.exitCode !== 0 || !version || compareVersions(version, GCM_MINIMUM_VERSION) < 0) {
+        throw new Error('Git Credential Manager 2.0.931 or newer is required. Install or update GCM, then run this command again.');
+    }
+    await runProcess('git', ['credential-manager', 'configure']);
+    const prefix = `credential.${baseUrl}`;
+    const settings = [
+        [`${prefix}.provider`, 'generic'],
+        [`${prefix}.oauthClientId`, 'skillshare-gcm'],
+        [`${prefix}.oauthRedirectUri`, 'http://127.0.0.1'],
+        [`${prefix}.oauthAuthorizeEndpoint`, '/api/git/oauth/authorize'],
+        [`${prefix}.oauthTokenEndpoint`, '/api/git/oauth/token'],
+        [`${prefix}.oauthScopes`, 'git.read'],
+        [`${prefix}.oauthDefaultUserName`, 'skillshare'],
+        [`${prefix}.oauthUseClientAuthHeader`, 'false'],
+        [`${prefix}.useHttpPath`, 'false'],
+    ];
+    for (const [key, value] of settings) {
+        await runProcess('git', ['config', '--global', '--replace-all', key, value]);
+    }
+    console.log(`Registered ${baseUrl} in Git Credential Manager ${formatVersion(version)}.`);
+}
+async function unconfigureGitCredentialManager(baseUrl) {
+    baseUrl = normalizeBaseUrl(baseUrl);
+    const prefix = `credential.${baseUrl}`;
+    for (const key of [
+        'provider',
+        'oauthClientId',
+        'oauthRedirectUri',
+        'oauthAuthorizeEndpoint',
+        'oauthTokenEndpoint',
+        'oauthScopes',
+        'oauthDefaultUserName',
+        'oauthUseClientAuthHeader',
+        'useHttpPath',
+    ]) {
+        await runProcess('git', ['config', '--global', '--unset-all', `${prefix}.${key}`], { allowFailure: true });
+    }
+    console.log(`Removed the Git Credential Manager registration for ${baseUrl}.`);
+}
+function parseVersion(value) {
+    const match = value.match(/(?:^|\s)(\d+)\.(\d+)\.(\d+)(?:\D|$)/);
+    return match ? [Number(match[1]), Number(match[2]), Number(match[3])] : null;
+}
+function compareVersions(left, right) {
+    for (let index = 0; index < Math.max(left.length, right.length); index += 1) {
+        const difference = (left[index] ?? 0) - (right[index] ?? 0);
+        if (difference !== 0) {
+            return difference;
+        }
+    }
+    return 0;
+}
+function formatVersion(version) {
+    return version.join('.');
+}
 async function parseOptions(args) {
     const booleanFlags = new Set(['dry-run']);
     const flags = {};
@@ -1806,6 +1879,8 @@ async function collectFilePlans(root, current = root, options = {}) {
     const files = [];
     for (const entry of entries) {
         const entryPath = join(current, entry.name);
+        if (options.pageProject && (entry.isSymbolicLink() || ['.git', '.celld', '.wrangler', 'node_modules'].includes(entry.name)))
+            continue;
         if (entry.isDirectory()) {
             files.push(...(await collectFilePlans(root, entryPath, options)));
             continue;

package/dist/pages.js

@@ -0,0 +1,51 @@
+import { builtinModules } from 'node:module';
+import { build } from 'esbuild';
+import { parse, printParseErrorCode } from 'jsonc-parser';
+import { resolve, relative } from 'node:path';
+export async function preparePageFiles(directory, files) {
+    const configurations = files.filter(file => file.relativePath === 'wrangler.json' || file.relativePath === 'wrangler.jsonc');
+    if (configurations.length > 1)
+        throw new Error('Publish only one of wrangler.json and wrangler.jsonc.');
+    const configFile = configurations[0];
+    if (!configFile) {
+        if (!files.some(file => file.relativePath === 'index.html'))
+            throw new Error('The page directory must contain index.html or a Wrangler configuration at its root.');
+        return files;
+    }
+    const errors = [];
+    const config = parse(configFile.content.toString('utf8'), errors, { allowTrailingComma: true });
+    if (errors.length || !config || typeof config !== 'object' || Array.isArray(config))
+        throw new Error(`Invalid ${configFile.relativePath}: ${errors.map(error => printParseErrorCode(error.error)).join(', ')}`);
+    if (!config.main || config.no_bundle === true)
+        return files;
+    if (typeof config.main !== 'string' || !files.some(file => file.relativePath === config.main.replace(/^\.\//, '')))
+        throw new Error('Wrangler main must name a file inside the uploaded project.');
+    if (files.some(file => file.relativePath.startsWith('__skillshare/')))
+        throw new Error('The __skillshare directory is reserved for the compiled Worker.');
+    const outputDirectory = resolve(directory, '__skillshare');
+    const output = await build({
+        absWorkingDir: directory,
+        entryPoints: [config.main],
+        outdir: outputDirectory,
+        entryNames: 'worker',
+        bundle: true,
+        write: false,
+        format: 'esm',
+        platform: 'browser',
+        target: 'es2024',
+        conditions: ['workerd', 'worker', 'browser'],
+        external: ['cloudflare:*', 'node:*', ...builtinModules],
+        loader: { '.wasm': 'copy' },
+    });
+    config.main = '__skillshare/worker.js';
+    // Native celld still performs its own validation/bundling, including sibling WASM modules.
+    const prepared = files.map(file => file === configFile
+        ? { ...file, content: Buffer.from(JSON.stringify(config, null, 2)) } : file);
+    for (const file of output.outputFiles)
+        prepared.push({
+            relativePath: relative(directory, file.path).replaceAll('\\', '/'),
+            content: Buffer.from(file.contents),
+            contentType: file.path.endsWith('.wasm') ? 'application/wasm' : 'text/javascript; charset=utf-8',
+        });
+    return prepared;
+}

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@quadient/skillshare",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "Skillshare CLI for installing and publishing Quadient skills",
   "type": "module",
   "bin": {
-    "skillshare": "./bin/skillshare"
+    "skillshare": "bin/skillshare"
   },
   "files": [
     "bin",
@@ -29,6 +29,8 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@clack/prompts": "^1.7.0"
+    "@clack/prompts": "^1.7.0",
+    "esbuild": "0.28.2",
+    "jsonc-parser": "3.3.1"
   }
 }