create-glosc 0.3.0 → 0.4.1

package/dist/templates.js

@@ -58,6 +58,7 @@ function packagingScriptMjs() {
     // Keep this script dependency-free and avoid nested template literals.
     return [
         'import { spawnSync } from "node:child_process";',
+        'import * as fs from "node:fs";',
         'import * as fsp from "node:fs/promises";',
         'import * as path from "node:path";',
         "",
@@ -70,18 +71,61 @@ function packagingScriptMjs() {
         "  });",
         "}",
         "",
-        "function hasCommand(cmd) {",
-        '  if (process.platform === "win32") {',
-        '    const r = run("where", [cmd]);',
-        "    return r.status === 0;",
+        "function runInherit(cmd, args, opts = {}) {",
+        "  return spawnSync(cmd, args, {",
+        '    stdio: "inherit",',
+        '    encoding: "utf8",',
+        "    shell: false,",
+        "    ...opts,",
+        "  });",
+        "}",
+        "",
+        "function normalizeRelPath(p) {",
+        '  return String(p || "").replace(/\\\\/g, "/");',
+        "}",
+        "",
+        "function readJsonIfExists(filePath) {",
+        "  try {",
+        "    if (!fs.existsSync(filePath)) return undefined;",
+        '    const raw = fs.readFileSync(filePath, "utf8");',
+        "    return JSON.parse(raw);",
+        "  } catch {",
+        "    return undefined;",
         "  }",
-        '  const check = "command -v " + cmd + " >/dev/null 2>&1";',
-        '  const r = run("sh", ["-lc", check]);',
-        "  return r.status === 0;",
         "}",
         "",
-        "function escapePsSingleQuotes(value) {",
-        '  return String(value || "").replace(/\'/g, "\'\'");',
+        "function detectTypeScriptProject() {",
+        '  if (fs.existsSync("tsconfig.json")) return true;',
+        '  const pkg = readJsonIfExists("package.json");',
+        '  const buildScript = String(pkg?.scripts?.build || "");',
+        '  if (buildScript.includes("tsc")) return true;',
+        "  if (pkg?.devDependencies?.typescript) return true;",
+        "  return false;",
+        "}",
+        "",
+        "function detectDistEntry() {",
+        "  // default requested: /dist/index.js",
+        '  const defaultEntry = "dist/index.js";',
+        '  const pkg = readJsonIfExists("package.json");',
+        '  const start = String(pkg?.scripts?.start || "").trim();',
+        "  const m = /^node\\s+(.+)$/.exec(start);",
+        '  const inferred = m && m[1] ? String(m[1]).trim() : "";',
+        "  const entry = inferred || defaultEntry;",
+        "  return normalizeRelPath(entry);",
+        "}",
+        "",
+        "function ensureGitRepoRoot() {",
+        '  const r = run("git", ["rev-parse", "--show-toplevel"], { cwd: process.cwd() });',
+        "  if (r.status !== 0) {",
+        '    const err = (r.stderr || r.stdout || "").trim();',
+        "    throw new Error(",
+        '      "git repo is required for packaging (to respect .gitignore).\\n" + err,',
+        "    );",
+        "  }",
+        '  const top = String(r.stdout || "").trim();',
+        '  if (!top) throw new Error("Failed to resolve git repo root");',
+        "  process.chdir(top);",
+        "  return top;",
         "}",
         "",
         "function gitFileList() {",
@@ -101,21 +145,100 @@ function packagingScriptMjs() {
         "  }",
         "",
         '  const raw = r.stdout || "";',
-        '  return raw.split("\\u0000").filter(Boolean);',
+        '  return raw.split("\\u0000").filter(Boolean).map(normalizeRelPath);',
+        "}",
+        "",
+        "function shouldExcludeFromPackage(relPath) {",
+        "  const p = normalizeRelPath(relPath);",
+        "  if (!p) return true;",
+        "  // 1) scripts/package.mjs does not need to be packaged",
+        '  if (p === "scripts/package.mjs") return true;',
+        "  // temp files created by this script",
+        '  if (p.startsWith(".glosc-tmp/")) return true;',
+        "  return false;",
+        "}",
+        "",
+        "function uniqStable(list) {",
+        "  const seen = new Set();",
+        "  const out = [];",
+        "  for (const item of list) {",
+        "    if (seen.has(item)) continue;",
+        "    seen.add(item);",
+        "    out.push(item);",
+        "  }",
+        "  return out;",
         "}",
         "",
         "async function ensureDir(p) {",
         "  await fsp.mkdir(p, { recursive: true });",
         "}",
         "",
-        "async function writeTempFileList(filePaths) {",
+        "async function prepareTmpDir() {",
         '  const tmpDir = path.join(process.cwd(), ".glosc-tmp");',
+        "  await fsp.rm(tmpDir, { recursive: true, force: true });",
         "  await ensureDir(tmpDir);",
-        '  const listPath = path.join(tmpDir, "zip-file-list.txt");',
-        '  await fsp.writeFile(listPath, filePaths.join("\\n"), "utf8");',
+        "  return tmpDir;",
+        "}",
+        "",
+        "async function writeNulSeparatedList(tmpDir, filePaths) {",
+        "  // Use NUL-separated pathspec so we can pass it to git safely (no quoting issues).",
+        '  const listPath = path.join(tmpDir, "pathspec.nul");',
+        "  const normalized = filePaths.map(normalizeRelPath);",
+        '  const buf = Buffer.from(normalized.join("\u0000") + "\u0000", "utf8");',
+        "  await fsp.writeFile(listPath, buf);",
         "  return listPath;",
         "}",
         "",
+        "function gitArchiveZipFromWorkingTreeFiles(outZip, filePaths) {",
+        "  // Create a temporary index so we can archive *tracked + untracked* files without",
+        "  // touching the user's real index or requiring a commit.",
+        '  const tmpIndex = path.join(process.cwd(), ".glosc-tmp", "index");',
+        "  const env = { ...process.env, GIT_INDEX_FILE: tmpIndex };",
+        "",
+        "  // Add files (force-add so ignored build output like dist/index.js can be included).",
+        "  const add = run(",
+        '    "git",',
+        "    [",
+        '      "add",',
+        '      "-f",',
+        '      "--pathspec-from-file=.glosc-tmp/pathspec.nul",',
+        '      "--pathspec-file-nul",',
+        '      "--",',
+        "    ],",
+        "    { cwd: process.cwd(), env },",
+        "  );",
+        "  if (add.status !== 0) {",
+        "    // Fallback for older Git versions without --pathspec-from-file.",
+        "    const chunkSize = 200;",
+        "    for (let i = 0; i < filePaths.length; i += chunkSize) {",
+        "      const chunk = filePaths.slice(i, i + chunkSize);",
+        '      const r = run("git", ["add", "-f", "--", ...chunk], { cwd: process.cwd(), env });',
+        "      if (r.status !== 0) {",
+        '        const err = (r.stderr || r.stdout || "").trim();',
+        '        throw new Error("git add (temp index) failed\\n" + err);',
+        "      }",
+        "    }",
+        "  }",
+        "",
+        '  const wt = run("git", ["write-tree"], { cwd: process.cwd(), env });',
+        "  if (wt.status !== 0) {",
+        '    const err = (wt.stderr || wt.stdout || "").trim();',
+        '    throw new Error("git write-tree failed\\n" + err);',
+        "  }",
+        '  const tree = String(wt.stdout || "").trim();',
+        '  if (!tree) throw new Error("git write-tree produced empty tree hash");',
+        "",
+        "  const ar = run(",
+        '    "git",',
+        '    ["archive", "--format=zip", "--output", outZip, tree],',
+        "    { cwd: process.cwd() },",
+        "  );",
+        "  if (ar.status !== 0) {",
+        '    const err = (ar.stderr || ar.stdout || "").trim();',
+        '    throw new Error("git archive failed\\n" + err);',
+        "  }",
+        "}",
+        "",
         "function timestamp() {",
         "  const d = new Date();",
         '  const pad = (n) => String(n).padStart(2, "0");',
@@ -131,7 +254,33 @@ function packagingScriptMjs() {
         "}",
         "",
         "async function main() {",
-        "  const files = gitFileList();",
+        "  ensureGitRepoRoot();",
+        "  const isTs = detectTypeScriptProject();",
+        "  const distEntry = detectDistEntry();",
+        '  const isWin = process.platform === "win32";',
+        "",
+        "  // 2) For TypeScript, run build and package dist entry",
+        "  if (isTs) {",
+        "    const r = isWin",
+        '      ? runInherit("cmd", ["/d", "/s", "/c", "npm run build"], { cwd: process.cwd() })',
+        '      : runInherit("npm", ["run", "build"], { cwd: process.cwd() });',
+        '    if (r.error) throw new Error("Failed to run npm: " + String(r.error?.message || r.error));',
+        '    if (r.status !== 0) throw new Error("npm run build failed");',
+        "    if (!fs.existsSync(distEntry)) {",
+        '      throw new Error("Expected build output missing: " + distEntry);',
+        "    }",
+        "  }",
+        "",
+        "  let files = gitFileList().filter((p) => !shouldExcludeFromPackage(p));",
+        "",
+        "  if (isTs) {",
+        "    // dist/ is typically ignored; ensure we still include the built entry",
+        '    files = files.filter((p) => !p.startsWith("dist/"));',
+        "    files.push(distEntry);",
+        "  }",
+        "",
+        "  files = uniqStable(files);",
+        "",
         "  if (files.length === 0) {",
         "    throw new Error(",
         '      "No files found to package. If you just created the project, make sure git is initialized and .gitignore exists.",',
@@ -142,56 +291,23 @@ function packagingScriptMjs() {
         "  await ensureDir(outDir);",
         '  const outZip = path.join(outDir, "glosc-package-" + timestamp() + ".zip");',
         "",
-        "  const listPath = await writeTempFileList(files);",
-        "",
+        "  const tmpDir = await prepareTmpDir();",
         "  try {",
-        '    if (hasCommand("powershell")) {',
-        "      const listEsc = escapePsSingleQuotes(listPath);",
-        "      const outEsc = escapePsSingleQuotes(outZip);",
-        "      const psCommand = [",
-        '        "$paths = Get-Content -LiteralPath \\\'" + listEsc + "\\\';",',
-        '        "Compress-Archive -LiteralPath $paths -DestinationPath \\\'" + outEsc + "\\\' -Force -CompressionLevel Optimal;",',
-        '      ].join(" ");',
-        "      const psArgs = [",
-        '        "-NoProfile",',
-        '        "-ExecutionPolicy",',
-        '        "Bypass",',
-        '        "-Command",',
-        "        psCommand,",
-        "      ];",
-        '      const r = run("powershell", psArgs, { cwd: process.cwd() });',
-        '      if (r.status !== 0) throw new Error((r.stderr || r.stdout || "").trim());',
-        '    } else if (hasCommand("pwsh")) {',
-        "      const listEsc = escapePsSingleQuotes(listPath);",
-        "      const outEsc = escapePsSingleQuotes(outZip);",
-        "      const psCommand = [",
-        '        "$paths = Get-Content -LiteralPath \\\'" + listEsc + "\\\';",',
-        '        "Compress-Archive -LiteralPath $paths -DestinationPath \\\'" + outEsc + "\\\' -Force -CompressionLevel Optimal;",',
-        '      ].join(" ");',
-        '      const psArgs = ["-NoProfile", "-Command", psCommand];',
-        '      const r = run("pwsh", psArgs, { cwd: process.cwd() });',
-        '      if (r.status !== 0) throw new Error((r.stderr || r.stdout || "").trim());',
-        '    } else if (hasCommand("zip")) {',
-        '      const r = spawnSync("zip", ["-q", "-r", outZip, "-@"], {',
-        "        cwd: process.cwd(),",
-        '        input: files.join("\\n"),',
-        '        stdio: ["pipe", "pipe", "pipe"],',
-        '        encoding: "utf8",',
-        "      });",
-        '      if (r.status !== 0) throw new Error((r.stderr || r.stdout || "").trim());',
-        "    } else {",
-        "      throw new Error(",
-        '        "No zip backend found. Install Git + PowerShell (Windows) or `zip` (macOS/Linux), then rerun.",',
-        "      );",
-        "    }",
+        "    await writeNulSeparatedList(tmpDir, files);",
+        "    gitArchiveZipFromWorkingTreeFiles(outZip, files);",
         "  } finally {",
         "    try {",
-        "      await fsp.rm(path.dirname(listPath), { recursive: true, force: true });",
+        "      await fsp.rm(tmpDir, { recursive: true, force: true });",
         "    } catch {",
         "      // ignore",
         "    }",
         "  }",
         "",
+        "  const st = await fsp.stat(outZip).catch(() => undefined);",
+        "  if (!st || st.size <= 0) {",
+        '    throw new Error("Packaging failed: zip was not created: " + outZip);',
+        "  }",
+        "",
         '  console.log("Created: " + outZip);',
         "}",
         "",
@@ -206,6 +322,14 @@ function entryPath(options) {
         ? options.mainFileName
         : `src/${options.mainFileName}`;
 }
+function mcpRuntime(options) {
+    return options.language === "python" ? "python" : "node";
+}
+function mcpEntry(options) {
+    if (options.language === "python")
+        return options.mainFileName;
+    return `dist/${options.mainFileName.replace(/\.ts$/i, ".js")}`;
+}
 function escapeYamlString(value) {
     const s = String(value ?? "");
     const escaped = s.replace(/"/g, '\\"');
@@ -223,7 +347,7 @@ function projectReadme(options) {
     const runSection = language === "python"
         ? `## Run (Python)\n\n\n\n1) Install deps\n\n\n\n\`\`\`sh\npython -m pip install -r requirements.txt\n\`\`\`\n\n\n\n2) Run the MCP server (stdio)\n\n\n\n\`\`\`sh\npython ${entry}\n\`\`\`\n\n\n\nThis server speaks MCP over stdio. Connect using an MCP client (e.g. an editor integration).\n`
         : `## Run (TypeScript)\n\n\n\n1) Install deps\n\n\n\n\`\`\`sh\nnpm install\n\`\`\`\n\n\n\n2) Build\n\n\n\n\`\`\`sh\nnpm run build\n\`\`\`\n\n\n\n3) Run the MCP server (stdio)\n\n\n\n\`\`\`sh\nnpm start\n\`\`\`\n\n\n\nThis server speaks MCP over stdio. Connect using an MCP client (e.g. an editor integration).\n`;
-    return `# ${projectName}\n\n${description || ""}\n\n## Author\n\n${author || ""}\n\n## Language\n\n${langLabel}\n\n## Entry\n\n- ${entry}\n\n## MCP Tools\n\n- get_current_time: Returns the current time (UTC, ISO 8601)\n\n${runSection}\n\n## Config\n\n- config.yml\n`;
+    return `# ${projectName}\n\n${description || ""}\n\n## Author\n\n${author || ""}\n\n## Language\n\n${langLabel}\n\n## Entry\n\n- ${entry}\n\n## MCP Tools\n\n- get_current_time: Returns the current time (UTC, ISO 8601)\n\n${runSection}\n\n## Config\n\n- config.yml (see: mcp.runtime / mcp.entry)\n`;
 }
 function packagingPackageJson(options) {
     const { projectName, description, author } = options;
@@ -244,9 +368,15 @@ function configYml(options) {
     return [
         `name: ${escapeYamlString(projectName)}`,
         `description: ${escapeYamlString(description)}`,
-        `author: ${escapeYamlString(author)}`,
+        `icon: ${escapeYamlString("")}`,
         `language: ${escapeYamlString(language)}`,
-        `entry: ${escapeYamlString(entryPath(options))}`,
+        `author: ${escapeYamlString(author)}`,
+        `mcp:`,
+        `  runtime: ${escapeYamlString(mcpRuntime(options))}`,
+        `  entry: ${escapeYamlString(mcpEntry(options))}`,
+        `  cwd: ${escapeYamlString(".")}`,
+        `  env: {}`,
+        `  args: []`,
         "",
     ].join("\n");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-glosc",
-    "version": "0.3.0",
+    "version": "0.4.1",
     "description": "Scaffold Glosc projects (Python/TypeScript) via npm create",
     "author": "glosc-ai",
     "license": "MIT",

package/src/templates.ts

@@ -78,6 +78,7 @@ function packagingScriptMjs(): string {
     // Keep this script dependency-free and avoid nested template literals.
     return [
         'import { spawnSync } from "node:child_process";',
+        'import * as fs from "node:fs";',
         'import * as fsp from "node:fs/promises";',
         'import * as path from "node:path";',
         "",
@@ -90,18 +91,61 @@ function packagingScriptMjs(): string {
         "  });",
         "}",
         "",
-        "function hasCommand(cmd) {",
-        '  if (process.platform === "win32") {',
-        '    const r = run("where", [cmd]);',
-        "    return r.status === 0;",
+        "function runInherit(cmd, args, opts = {}) {",
+        "  return spawnSync(cmd, args, {",
+        '    stdio: "inherit",',
+        '    encoding: "utf8",',
+        "    shell: false,",
+        "    ...opts,",
+        "  });",
+        "}",
+        "",
+        "function normalizeRelPath(p) {",
+        '  return String(p || "").replace(/\\\\/g, "/");',
+        "}",
+        "",
+        "function readJsonIfExists(filePath) {",
+        "  try {",
+        "    if (!fs.existsSync(filePath)) return undefined;",
+        '    const raw = fs.readFileSync(filePath, "utf8");',
+        "    return JSON.parse(raw);",
+        "  } catch {",
+        "    return undefined;",
         "  }",
-        '  const check = "command -v " + cmd + " >/dev/null 2>&1";',
-        '  const r = run("sh", ["-lc", check]);',
-        "  return r.status === 0;",
         "}",
         "",
-        "function escapePsSingleQuotes(value) {",
-        '  return String(value || "").replace(/\'/g, "\'\'");',
+        "function detectTypeScriptProject() {",
+        '  if (fs.existsSync("tsconfig.json")) return true;',
+        '  const pkg = readJsonIfExists("package.json");',
+        '  const buildScript = String(pkg?.scripts?.build || "");',
+        '  if (buildScript.includes("tsc")) return true;',
+        "  if (pkg?.devDependencies?.typescript) return true;",
+        "  return false;",
+        "}",
+        "",
+        "function detectDistEntry() {",
+        "  // default requested: /dist/index.js",
+        '  const defaultEntry = "dist/index.js";',
+        '  const pkg = readJsonIfExists("package.json");',
+        '  const start = String(pkg?.scripts?.start || "").trim();',
+        "  const m = /^node\\s+(.+)$/.exec(start);",
+        '  const inferred = m && m[1] ? String(m[1]).trim() : "";',
+        "  const entry = inferred || defaultEntry;",
+        "  return normalizeRelPath(entry);",
+        "}",
+        "",
+        "function ensureGitRepoRoot() {",
+        '  const r = run("git", ["rev-parse", "--show-toplevel"], { cwd: process.cwd() });',
+        "  if (r.status !== 0) {",
+        '    const err = (r.stderr || r.stdout || "").trim();',
+        "    throw new Error(",
+        '      "git repo is required for packaging (to respect .gitignore).\\n" + err,',
+        "    );",
+        "  }",
+        '  const top = String(r.stdout || "").trim();',
+        '  if (!top) throw new Error("Failed to resolve git repo root");',
+        "  process.chdir(top);",
+        "  return top;",
         "}",
         "",
         "function gitFileList() {",
@@ -121,21 +165,100 @@ function packagingScriptMjs(): string {
         "  }",
         "",
         '  const raw = r.stdout || "";',
-        '  return raw.split("\\u0000").filter(Boolean);',
+        '  return raw.split("\\u0000").filter(Boolean).map(normalizeRelPath);',
+        "}",
+        "",
+        "function shouldExcludeFromPackage(relPath) {",
+        "  const p = normalizeRelPath(relPath);",
+        "  if (!p) return true;",
+        "  // 1) scripts/package.mjs does not need to be packaged",
+        '  if (p === "scripts/package.mjs") return true;',
+        "  // temp files created by this script",
+        '  if (p.startsWith(".glosc-tmp/")) return true;',
+        "  return false;",
+        "}",
+        "",
+        "function uniqStable(list) {",
+        "  const seen = new Set();",
+        "  const out = [];",
+        "  for (const item of list) {",
+        "    if (seen.has(item)) continue;",
+        "    seen.add(item);",
+        "    out.push(item);",
+        "  }",
+        "  return out;",
         "}",
         "",
         "async function ensureDir(p) {",
         "  await fsp.mkdir(p, { recursive: true });",
         "}",
         "",
-        "async function writeTempFileList(filePaths) {",
+        "async function prepareTmpDir() {",
         '  const tmpDir = path.join(process.cwd(), ".glosc-tmp");',
+        "  await fsp.rm(tmpDir, { recursive: true, force: true });",
         "  await ensureDir(tmpDir);",
-        '  const listPath = path.join(tmpDir, "zip-file-list.txt");',
-        '  await fsp.writeFile(listPath, filePaths.join("\\n"), "utf8");',
+        "  return tmpDir;",
+        "}",
+        "",
+        "async function writeNulSeparatedList(tmpDir, filePaths) {",
+        "  // Use NUL-separated pathspec so we can pass it to git safely (no quoting issues).",
+        '  const listPath = path.join(tmpDir, "pathspec.nul");',
+        "  const normalized = filePaths.map(normalizeRelPath);",
+        '  const buf = Buffer.from(normalized.join("\u0000") + "\u0000", "utf8");',
+        "  await fsp.writeFile(listPath, buf);",
         "  return listPath;",
         "}",
         "",
+        "function gitArchiveZipFromWorkingTreeFiles(outZip, filePaths) {",
+        "  // Create a temporary index so we can archive *tracked + untracked* files without",
+        "  // touching the user's real index or requiring a commit.",
+        '  const tmpIndex = path.join(process.cwd(), ".glosc-tmp", "index");',
+        "  const env = { ...process.env, GIT_INDEX_FILE: tmpIndex };",
+        "",
+        "  // Add files (force-add so ignored build output like dist/index.js can be included).",
+        "  const add = run(",
+        '    "git",',
+        "    [",
+        '      "add",',
+        '      "-f",',
+        '      "--pathspec-from-file=.glosc-tmp/pathspec.nul",',
+        '      "--pathspec-file-nul",',
+        '      "--",',
+        "    ],",
+        "    { cwd: process.cwd(), env },",
+        "  );",
+        "  if (add.status !== 0) {",
+        "    // Fallback for older Git versions without --pathspec-from-file.",
+        "    const chunkSize = 200;",
+        "    for (let i = 0; i < filePaths.length; i += chunkSize) {",
+        "      const chunk = filePaths.slice(i, i + chunkSize);",
+        '      const r = run("git", ["add", "-f", "--", ...chunk], { cwd: process.cwd(), env });',
+        "      if (r.status !== 0) {",
+        '        const err = (r.stderr || r.stdout || "").trim();',
+        '        throw new Error("git add (temp index) failed\\n" + err);',
+        "      }",
+        "    }",
+        "  }",
+        "",
+        '  const wt = run("git", ["write-tree"], { cwd: process.cwd(), env });',
+        "  if (wt.status !== 0) {",
+        '    const err = (wt.stderr || wt.stdout || "").trim();',
+        '    throw new Error("git write-tree failed\\n" + err);',
+        "  }",
+        '  const tree = String(wt.stdout || "").trim();',
+        '  if (!tree) throw new Error("git write-tree produced empty tree hash");',
+        "",
+        "  const ar = run(",
+        '    "git",',
+        '    ["archive", "--format=zip", "--output", outZip, tree],',
+        "    { cwd: process.cwd() },",
+        "  );",
+        "  if (ar.status !== 0) {",
+        '    const err = (ar.stderr || ar.stdout || "").trim();',
+        '    throw new Error("git archive failed\\n" + err);',
+        "  }",
+        "}",
+        "",
         "function timestamp() {",
         "  const d = new Date();",
         '  const pad = (n) => String(n).padStart(2, "0");',
@@ -151,7 +274,33 @@ function packagingScriptMjs(): string {
         "}",
         "",
         "async function main() {",
-        "  const files = gitFileList();",
+        "  ensureGitRepoRoot();",
+        "  const isTs = detectTypeScriptProject();",
+        "  const distEntry = detectDistEntry();",
+        '  const isWin = process.platform === "win32";',
+        "",
+        "  // 2) For TypeScript, run build and package dist entry",
+        "  if (isTs) {",
+        "    const r = isWin",
+        '      ? runInherit("cmd", ["/d", "/s", "/c", "npm run build"], { cwd: process.cwd() })',
+        '      : runInherit("npm", ["run", "build"], { cwd: process.cwd() });',
+        '    if (r.error) throw new Error("Failed to run npm: " + String(r.error?.message || r.error));',
+        '    if (r.status !== 0) throw new Error("npm run build failed");',
+        "    if (!fs.existsSync(distEntry)) {",
+        '      throw new Error("Expected build output missing: " + distEntry);',
+        "    }",
+        "  }",
+        "",
+        "  let files = gitFileList().filter((p) => !shouldExcludeFromPackage(p));",
+        "",
+        "  if (isTs) {",
+        "    // dist/ is typically ignored; ensure we still include the built entry",
+        '    files = files.filter((p) => !p.startsWith("dist/"));',
+        "    files.push(distEntry);",
+        "  }",
+        "",
+        "  files = uniqStable(files);",
+        "",
         "  if (files.length === 0) {",
         "    throw new Error(",
         '      "No files found to package. If you just created the project, make sure git is initialized and .gitignore exists.",',
@@ -162,56 +311,23 @@ function packagingScriptMjs(): string {
         "  await ensureDir(outDir);",
         '  const outZip = path.join(outDir, "glosc-package-" + timestamp() + ".zip");',
         "",
-        "  const listPath = await writeTempFileList(files);",
-        "",
+        "  const tmpDir = await prepareTmpDir();",
         "  try {",
-        '    if (hasCommand("powershell")) {',
-        "      const listEsc = escapePsSingleQuotes(listPath);",
-        "      const outEsc = escapePsSingleQuotes(outZip);",
-        "      const psCommand = [",
-        '        "$paths = Get-Content -LiteralPath \\\'" + listEsc + "\\\';",',
-        '        "Compress-Archive -LiteralPath $paths -DestinationPath \\\'" + outEsc + "\\\' -Force -CompressionLevel Optimal;",',
-        '      ].join(" ");',
-        "      const psArgs = [",
-        '        "-NoProfile",',
-        '        "-ExecutionPolicy",',
-        '        "Bypass",',
-        '        "-Command",',
-        "        psCommand,",
-        "      ];",
-        '      const r = run("powershell", psArgs, { cwd: process.cwd() });',
-        '      if (r.status !== 0) throw new Error((r.stderr || r.stdout || "").trim());',
-        '    } else if (hasCommand("pwsh")) {',
-        "      const listEsc = escapePsSingleQuotes(listPath);",
-        "      const outEsc = escapePsSingleQuotes(outZip);",
-        "      const psCommand = [",
-        '        "$paths = Get-Content -LiteralPath \\\'" + listEsc + "\\\';",',
-        '        "Compress-Archive -LiteralPath $paths -DestinationPath \\\'" + outEsc + "\\\' -Force -CompressionLevel Optimal;",',
-        '      ].join(" ");',
-        '      const psArgs = ["-NoProfile", "-Command", psCommand];',
-        '      const r = run("pwsh", psArgs, { cwd: process.cwd() });',
-        '      if (r.status !== 0) throw new Error((r.stderr || r.stdout || "").trim());',
-        '    } else if (hasCommand("zip")) {',
-        '      const r = spawnSync("zip", ["-q", "-r", outZip, "-@"], {',
-        "        cwd: process.cwd(),",
-        '        input: files.join("\\n"),',
-        '        stdio: ["pipe", "pipe", "pipe"],',
-        '        encoding: "utf8",',
-        "      });",
-        '      if (r.status !== 0) throw new Error((r.stderr || r.stdout || "").trim());',
-        "    } else {",
-        "      throw new Error(",
-        '        "No zip backend found. Install Git + PowerShell (Windows) or `zip` (macOS/Linux), then rerun.",',
-        "      );",
-        "    }",
+        "    await writeNulSeparatedList(tmpDir, files);",
+        "    gitArchiveZipFromWorkingTreeFiles(outZip, files);",
         "  } finally {",
         "    try {",
-        "      await fsp.rm(path.dirname(listPath), { recursive: true, force: true });",
+        "      await fsp.rm(tmpDir, { recursive: true, force: true });",
         "    } catch {",
         "      // ignore",
         "    }",
         "  }",
         "",
+        "  const st = await fsp.stat(outZip).catch(() => undefined);",
+        "  if (!st || st.size <= 0) {",
+        '    throw new Error("Packaging failed: zip was not created: " + outZip);',
+        "  }",
+        "",
         '  console.log("Created: " + outZip);',
         "}",
         "",
@@ -228,6 +344,15 @@ function entryPath(options: ProjectOptions): string {
         : `src/${options.mainFileName}`;
 }
 
+function mcpRuntime(options: ProjectOptions): "python" | "node" {
+    return options.language === "python" ? "python" : "node";
+}
+
+function mcpEntry(options: ProjectOptions): string {
+    if (options.language === "python") return options.mainFileName;
+    return `dist/${options.mainFileName.replace(/\.ts$/i, ".js")}`;
+}
+
 function escapeYamlString(value: unknown): string {
     const s = String(value ?? "");
     const escaped = s.replace(/"/g, '\\"');
@@ -253,7 +378,7 @@ function projectReadme(options: ProjectOptions): string {
 
     return `# ${projectName}\n\n${description || ""}\n\n## Author\n\n${
         author || ""
-    }\n\n## Language\n\n${langLabel}\n\n## Entry\n\n- ${entry}\n\n## MCP Tools\n\n- get_current_time: Returns the current time (UTC, ISO 8601)\n\n${runSection}\n\n## Config\n\n- config.yml\n`;
+    }\n\n## Language\n\n${langLabel}\n\n## Entry\n\n- ${entry}\n\n## MCP Tools\n\n- get_current_time: Returns the current time (UTC, ISO 8601)\n\n${runSection}\n\n## Config\n\n- config.yml (see: mcp.runtime / mcp.entry)\n`;
 }
 
 function packagingPackageJson(options: ProjectOptions): string {
@@ -278,9 +403,15 @@ function configYml(options: ProjectOptions): string {
     return [
         `name: ${escapeYamlString(projectName)}`,
         `description: ${escapeYamlString(description)}`,
-        `author: ${escapeYamlString(author)}`,
+        `icon: ${escapeYamlString("")}`,
         `language: ${escapeYamlString(language)}`,
-        `entry: ${escapeYamlString(entryPath(options))}`,
+        `author: ${escapeYamlString(author)}`,
+        `mcp:`,
+        `  runtime: ${escapeYamlString(mcpRuntime(options))}`,
+        `  entry: ${escapeYamlString(mcpEntry(options))}`,
+        `  cwd: ${escapeYamlString(".")}`,
+        `  env: {}`,
+        `  args: []`,
         "",
     ].join("\n");
 }