@xortex/xcode 3.1.1 → 3.1.3

package/outputStyles/loadOutputStylesDir.ts

@@ -0,0 +1,98 @@
+import memoize from 'lodash-es/memoize.js'
+import { basename } from 'path'
+import type { OutputStyleConfig } from '../constants/outputStyles.js'
+import { logForDebugging } from '../utils/debug.js'
+import { coerceDescriptionToString } from '../utils/frontmatterParser.js'
+import { logError } from '../utils/log.js'
+import {
+  extractDescriptionFromMarkdown,
+  loadMarkdownFilesForSubdir,
+} from '../utils/markdownConfigLoader.js'
+import { clearPluginOutputStyleCache } from '../utils/plugins/loadPluginOutputStyles.js'
+
+/**
+ * Loads markdown files from .claude/output-styles directories throughout the project
+ * and from ~/.claude/output-styles directory and converts them to output styles.
+ *
+ * Each filename becomes a style name, and the file content becomes the style prompt.
+ * The frontmatter provides name and description.
+ *
+ * Structure:
+ * - Project .claude/output-styles/*.md -> project styles
+ * - User ~/.claude/output-styles/*.md -> user styles (overridden by project styles)
+ *
+ * @param cwd Current working directory for project directory traversal
+ */
+export const getOutputStyleDirStyles = memoize(
+  async (cwd: string): Promise<OutputStyleConfig[]> => {
+    try {
+      const markdownFiles = await loadMarkdownFilesForSubdir(
+        'output-styles',
+        cwd,
+      )
+
+      const styles = markdownFiles
+        .map(({ filePath, frontmatter, content, source }) => {
+          try {
+            const fileName = basename(filePath)
+            const styleName = fileName.replace(/\.md$/, '')
+
+            // Get style configuration from frontmatter
+            const name = (frontmatter['name'] || styleName) as string
+            const description =
+              coerceDescriptionToString(
+                frontmatter['description'],
+                styleName,
+              ) ??
+              extractDescriptionFromMarkdown(
+                content,
+                `Custom ${styleName} output style`,
+              )
+
+            // Parse keep-coding-instructions flag (supports both boolean and string values)
+            const keepCodingInstructionsRaw =
+              frontmatter['keep-coding-instructions']
+            const keepCodingInstructions =
+              keepCodingInstructionsRaw === true ||
+              keepCodingInstructionsRaw === 'true'
+                ? true
+                : keepCodingInstructionsRaw === false ||
+                    keepCodingInstructionsRaw === 'false'
+                  ? false
+                  : undefined
+
+            // Warn if force-for-plugin is set on non-plugin output style
+            if (frontmatter['force-for-plugin'] !== undefined) {
+              logForDebugging(
+                `Output style "${name}" has force-for-plugin set, but this option only applies to plugin output styles. Ignoring.`,
+                { level: 'warn' },
+              )
+            }
+
+            return {
+              name,
+              description,
+              prompt: content.trim(),
+              source,
+              keepCodingInstructions,
+            }
+          } catch (error) {
+            logError(error)
+            return null
+          }
+        })
+        .filter(style => style !== null)
+
+      return styles
+    } catch (error) {
+      logError(error)
+      return []
+    }
+  },
+)
+
+export function clearOutputStyleCaches(): void {
+  getOutputStyleDirStyles.cache?.clear?.()
+  loadMarkdownFilesForSubdir.cache?.clear?.()
+  clearPluginOutputStyleCache()
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xortex/xcode",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "description": "XCode - AI-powered coding assistant with XMem long-term memory. Supports Claude, Gemini, Kimi, DeepSeek via OpenRouter.",
   "main": "main.tsx",
   "bin": {
@@ -37,17 +37,28 @@
     "types/",
     "upstreamproxy/",
     "utils/",
+    "vim/",
     "voice/",
+    "plugins/",
+    "public/",
+    "server/",
+    "outputStyles/",
+    "moreright/",
+    "native-ts/",
     "bun-bundle-hook.js",
     "bun-bundle-shim.ts",
     "tsconfig.json",
     "macro.ts",
     "main.tsx",
+    "ink.ts",
     "commands.ts",
     "context.ts",
     "cost-tracker.ts",
+    "costHook.ts",
     "history.ts",
     "interactiveHelpers.tsx",
+    "replLauncher.tsx",
+    "dialogLaunchers.tsx",
     "QueryEngine.ts",
     "query.ts",
     "setup.ts",
@@ -55,7 +66,7 @@
     "Task.ts",
     "Tool.ts",
     "tools.ts",
-    "ink.ts",
+    "projectOnboardingState.ts",
     "README.md",
     "LICENSE"
   ],

package/plugins/builtinPlugins.ts

@@ -0,0 +1,159 @@
+/**
+ * Built-in Plugin Registry
+ *
+ * Manages built-in plugins that ship with the CLI and can be enabled/disabled
+ * by users via the /plugin UI.
+ *
+ * Built-in plugins differ from bundled skills (src/skills/bundled/) in that:
+ * - They appear in the /plugin UI under a "Built-in" section
+ * - Users can enable/disable them (persisted to user settings)
+ * - They can provide multiple components (skills, hooks, MCP servers)
+ *
+ * Plugin IDs use the format `{name}@builtin` to distinguish them from
+ * marketplace plugins (`{name}@{marketplace}`).
+ */
+
+import type { Command } from '../commands.js'
+import type { BundledSkillDefinition } from '../skills/bundledSkills.js'
+import type { BuiltinPluginDefinition, LoadedPlugin } from '../types/plugin.js'
+import { getSettings_DEPRECATED } from '../utils/settings/settings.js'
+
+const BUILTIN_PLUGINS: Map<string, BuiltinPluginDefinition> = new Map()
+
+export const BUILTIN_MARKETPLACE_NAME = 'builtin'
+
+/**
+ * Register a built-in plugin. Call this from initBuiltinPlugins() at startup.
+ */
+export function registerBuiltinPlugin(
+  definition: BuiltinPluginDefinition,
+): void {
+  BUILTIN_PLUGINS.set(definition.name, definition)
+}
+
+/**
+ * Check if a plugin ID represents a built-in plugin (ends with @builtin).
+ */
+export function isBuiltinPluginId(pluginId: string): boolean {
+  return pluginId.endsWith(`@${BUILTIN_MARKETPLACE_NAME}`)
+}
+
+/**
+ * Get a specific built-in plugin definition by name.
+ * Useful for the /plugin UI to show the skills/hooks/MCP list without
+ * a marketplace lookup.
+ */
+export function getBuiltinPluginDefinition(
+  name: string,
+): BuiltinPluginDefinition | undefined {
+  return BUILTIN_PLUGINS.get(name)
+}
+
+/**
+ * Get all registered built-in plugins as LoadedPlugin objects, split into
+ * enabled/disabled based on user settings (with defaultEnabled as fallback).
+ * Plugins whose isAvailable() returns false are omitted entirely.
+ */
+export function getBuiltinPlugins(): {
+  enabled: LoadedPlugin[]
+  disabled: LoadedPlugin[]
+} {
+  const settings = getSettings_DEPRECATED()
+  const enabled: LoadedPlugin[] = []
+  const disabled: LoadedPlugin[] = []
+
+  for (const [name, definition] of BUILTIN_PLUGINS) {
+    if (definition.isAvailable && !definition.isAvailable()) {
+      continue
+    }
+
+    const pluginId = `${name}@${BUILTIN_MARKETPLACE_NAME}`
+    const userSetting = settings?.enabledPlugins?.[pluginId]
+    // Enabled state: user preference > plugin default > true
+    const isEnabled =
+      userSetting !== undefined
+        ? userSetting === true
+        : (definition.defaultEnabled ?? true)
+
+    const plugin: LoadedPlugin = {
+      name,
+      manifest: {
+        name,
+        description: definition.description,
+        version: definition.version,
+      },
+      path: BUILTIN_MARKETPLACE_NAME, // sentinel — no filesystem path
+      source: pluginId,
+      repository: pluginId,
+      enabled: isEnabled,
+      isBuiltin: true,
+      hooksConfig: definition.hooks,
+      mcpServers: definition.mcpServers,
+    }
+
+    if (isEnabled) {
+      enabled.push(plugin)
+    } else {
+      disabled.push(plugin)
+    }
+  }
+
+  return { enabled, disabled }
+}
+
+/**
+ * Get skills from enabled built-in plugins as Command objects.
+ * Skills from disabled plugins are not returned.
+ */
+export function getBuiltinPluginSkillCommands(): Command[] {
+  const { enabled } = getBuiltinPlugins()
+  const commands: Command[] = []
+
+  for (const plugin of enabled) {
+    const definition = BUILTIN_PLUGINS.get(plugin.name)
+    if (!definition?.skills) continue
+    for (const skill of definition.skills) {
+      commands.push(skillDefinitionToCommand(skill))
+    }
+  }
+
+  return commands
+}
+
+/**
+ * Clear built-in plugins registry (for testing).
+ */
+export function clearBuiltinPlugins(): void {
+  BUILTIN_PLUGINS.clear()
+}
+
+// --
+
+function skillDefinitionToCommand(definition: BundledSkillDefinition): Command {
+  return {
+    type: 'prompt',
+    name: definition.name,
+    description: definition.description,
+    hasUserSpecifiedDescription: true,
+    allowedTools: definition.allowedTools ?? [],
+    argumentHint: definition.argumentHint,
+    whenToUse: definition.whenToUse,
+    model: definition.model,
+    disableModelInvocation: definition.disableModelInvocation ?? false,
+    userInvocable: definition.userInvocable ?? true,
+    contentLength: 0,
+    // 'bundled' not 'builtin' — 'builtin' in Command.source means hardcoded
+    // slash commands (/help, /clear). Using 'bundled' keeps these skills in
+    // the Skill tool's listing, analytics name logging, and prompt-truncation
+    // exemption. The user-toggleable aspect is tracked on LoadedPlugin.isBuiltin.
+    source: 'bundled',
+    loadedFrom: 'bundled',
+    hooks: definition.hooks,
+    context: definition.context,
+    agent: definition.agent,
+    isEnabled: definition.isEnabled ?? (() => true),
+    isHidden: !(definition.userInvocable ?? true),
+    progressMessage: 'running',
+    getPromptForCommand: definition.getPromptForCommand,
+  }
+}

package/plugins/bundled/index.ts

@@ -0,0 +1,23 @@
+/**
+ * Built-in Plugin Initialization
+ *
+ * Initializes built-in plugins that ship with the CLI and appear in the
+ * /plugin UI for users to enable/disable.
+ *
+ * Not all bundled features should be built-in plugins — use this for
+ * features that users should be able to explicitly enable/disable. For
+ * features with complex setup or automatic-enabling logic (e.g.
+ * claude-in-chrome), use src/skills/bundled/ instead.
+ *
+ * To add a new built-in plugin:
+ * 1. Import registerBuiltinPlugin from '../builtinPlugins.js'
+ * 2. Call registerBuiltinPlugin() with the plugin definition here
+ */
+
+/**
+ * Initialize built-in plugins. Called during CLI startup.
+ */
+export function initBuiltinPlugins(): void {
+  // No built-in plugins registered yet — this is the scaffolding for
+  // migrating bundled skills that should be user-toggleable.
+}

package/projectOnboardingState.ts

@@ -0,0 +1,83 @@
+import memoize from 'lodash-es/memoize.js'
+import { join } from 'path'
+import {
+  getCurrentProjectConfig,
+  saveCurrentProjectConfig,
+} from './utils/config.js'
+import { getCwd } from './utils/cwd.js'
+import { isDirEmpty } from './utils/file.js'
+import { getFsImplementation } from './utils/fsOperations.js'
+
+export type Step = {
+  key: string
+  text: string
+  isComplete: boolean
+  isCompletable: boolean
+  isEnabled: boolean
+}
+
+export function getSteps(): Step[] {
+  const hasClaudeMd = getFsImplementation().existsSync(
+    join(getCwd(), 'CLAUDE.md'),
+  )
+  const isWorkspaceDirEmpty = isDirEmpty(getCwd())
+
+  return [
+    {
+      key: 'workspace',
+      text: 'Ask Claude to create a new app or clone a repository',
+      isComplete: false,
+      isCompletable: true,
+      isEnabled: isWorkspaceDirEmpty,
+    },
+    {
+      key: 'claudemd',
+      text: 'Run /init to create a CLAUDE.md file with instructions for Claude',
+      isComplete: hasClaudeMd,
+      isCompletable: true,
+      isEnabled: !isWorkspaceDirEmpty,
+    },
+  ]
+}
+
+export function isProjectOnboardingComplete(): boolean {
+  return getSteps()
+    .filter(({ isCompletable, isEnabled }) => isCompletable && isEnabled)
+    .every(({ isComplete }) => isComplete)
+}
+
+export function maybeMarkProjectOnboardingComplete(): void {
+  // Short-circuit on cached config — isProjectOnboardingComplete() hits
+  // the filesystem, and REPL.tsx calls this on every prompt submit.
+  if (getCurrentProjectConfig().hasCompletedProjectOnboarding) {
+    return
+  }
+  if (isProjectOnboardingComplete()) {
+    saveCurrentProjectConfig(current => ({
+      ...current,
+      hasCompletedProjectOnboarding: true,
+    }))
+  }
+}
+
+export const shouldShowProjectOnboarding = memoize((): boolean => {
+  const projectConfig = getCurrentProjectConfig()
+  // Short-circuit on cached config before isProjectOnboardingComplete()
+  // hits the filesystem — this runs during first render.
+  if (
+    projectConfig.hasCompletedProjectOnboarding ||
+    projectConfig.projectOnboardingSeenCount >= 4 ||
+    process.env.IS_DEMO
+  ) {
+    return false
+  }
+
+  return !isProjectOnboardingComplete()
+})
+
+export function incrementProjectOnboardingSeenCount(): void {
+  saveCurrentProjectConfig(current => ({
+    ...current,
+    projectOnboardingSeenCount: current.projectOnboardingSeenCount + 1,
+  }))
+}

package/replLauncher.tsx

@@ -0,0 +1,27 @@
+import React from "react";
+import type { StatsStore } from "./context/stats.js";
+import type { Root } from "./ink.js";
+import type { Props as REPLProps } from "./screens/REPL.js";
+import type { AppState } from "./state/AppStateStore.js";
+import type { FpsMetrics } from "./utils/fpsTracker.js";
+type AppWrapperProps = {
+  getFpsMetrics: () => FpsMetrics | undefined;
+  stats?: StatsStore;
+  initialState: AppState;
+};
+export async function launchRepl(
+  root: Root,
+  appProps: AppWrapperProps,
+  replProps: REPLProps,
+  renderAndRun: (root: Root, element: React.ReactNode) => Promise<void>,
+): Promise<void> {
+  const { App } = await import("./components/App.js");
+  const { REPL } = await import("./screens/REPL.js");
+  await renderAndRun(
+    root,
+    <App {...appProps}>
+      <REPL {...replProps} />
+    </App>,
+  );
+}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJSZWFjdCIsIlN0YXRzU3RvcmUiLCJSb290IiwiUHJvcHMiLCJSRVBMUHJvcHMiLCJBcHBTdGF0ZSIsIkZwc01ldHJpY3MiLCJBcHBXcmFwcGVyUHJvcHMiLCJnZXRGcHNNZXRyaWNzIiwic3RhdHMiLCJpbml0aWFsU3RhdGUiLCJsYXVuY2hSZXBsIiwicm9vdCIsImFwcFByb3BzIiwicmVwbFByb3BzIiwicmVuZGVyQW5kUnVuIiwiZWxlbWVudCIsIlJlYWN0Tm9kZSIsIlByb21pc2UiLCJBcHAiLCJSRVBMIl0sInNvdXJjZXMiOlsicmVwbExhdW5jaGVyLnRzeCJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnXG5pbXBvcnQgdHlwZSB7IFN0YXRzU3RvcmUgfSBmcm9tICcuL2NvbnRleHQvc3RhdHMuanMnXG5pbXBvcnQgdHlwZSB7IFJvb3QgfSBmcm9tICcuL2luay5qcydcbmltcG9ydCB0eXBlIHsgUHJvcHMgYXMgUkVQTFByb3BzIH0gZnJvbSAnLi9zY3JlZW5zL1JFUEwuanMnXG5pbXBvcnQgdHlwZSB7IEFwcFN0YXRlIH0gZnJvbSAnLi9zdGF0ZS9BcHBTdGF0ZVN0b3JlLmpzJ1xuaW1wb3J0IHR5cGUgeyBGcHNNZXRyaWNzIH0gZnJvbSAnLi91dGlscy9mcHNUcmFja2VyLmpzJ1xuXG50eXBlIEFwcFdyYXBwZXJQcm9wcyA9IHtcbiAgZ2V0RnBzTWV0cmljczogKCkgPT4gRnBzTWV0cmljcyB8IHVuZGVmaW5lZFxuICBzdGF0cz86IFN0YXRzU3RvcmVcbiAgaW5pdGlhbFN0YXRlOiBBcHBTdGF0ZVxufVxuXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gbGF1bmNoUmVwbChcbiAgcm9vdDogUm9vdCxcbiAgYXBwUHJvcHM6IEFwcFdyYXBwZXJQcm9wcyxcbiAgcmVwbFByb3BzOiBSRVBMUHJvcHMsXG4gIHJlbmRlckFuZFJ1bjogKHJvb3Q6IFJvb3QsIGVsZW1lbnQ6IFJlYWN0LlJlYWN0Tm9kZSkgPT4gUHJvbWlzZTx2b2lkPixcbik6IFByb21pc2U8dm9pZD4ge1xuICBjb25zdCB7IEFwcCB9ID0gYXdhaXQgaW1wb3J0KCcuL2NvbXBvbmVudHMvQXBwLmpzJylcbiAgY29uc3QgeyBSRVBMIH0gPSBhd2FpdCBpbXBvcnQoJy4vc2NyZWVucy9SRVBMLmpzJylcbiAgYXdhaXQgcmVuZGVyQW5kUnVuKFxuICAgIHJvb3QsXG4gICAgPEFwcCB7Li4uYXBwUHJvcHN9PlxuICAgICAgPFJFUEwgey4uLnJlcGxQcm9wc30gLz5cbiAgICA8L0FwcD4sXG4gIClcbn1cbiJdLCJtYXBwaW5ncyI6IkFBQUEsT0FBT0EsS0FBSyxNQUFNLE9BQU87QUFDekIsY0FBY0MsVUFBVSxRQUFRLG9CQUFvQjtBQUNwRCxjQUFjQyxJQUFJLFFBQVEsVUFBVTtBQUNwQyxjQUFjQyxLQUFLLElBQUlDLFNBQVMsUUFBUSxtQkFBbUI7QUFDM0QsY0FBY0MsUUFBUSxRQUFRLDBCQUEwQjtBQUN4RCxjQUFjQyxVQUFVLFFBQVEsdUJBQXVCO0FBRXZELEtBQUtDLGVBQWUsR0FBRztFQUNyQkMsYUFBYSxFQUFFLEdBQUcsR0FBR0YsVUFBVSxHQUFHLFNBQVM7RUFDM0NHLEtBQUssQ0FBQyxFQUFFUixVQUFVO0VBQ2xCUyxZQUFZLEVBQUVMLFFBQVE7QUFDeEIsQ0FBQztBQUVELE9BQU8sZUFBZU0sVUFBVUEsQ0FDOUJDLElBQUksRUFBRVYsSUFBSSxFQUNWVyxRQUFRLEVBQUVOLGVBQWUsRUFDekJPLFNBQVMsRUFBRVYsU0FBUyxFQUNwQlcsWUFBWSxFQUFFLENBQUNILElBQUksRUFBRVYsSUFBSSxFQUFFYyxPQUFPLEVBQUVoQixLQUFLLENBQUNpQixTQUFTLEVBQUUsR0FBR0MsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUN0RSxFQUFFQSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7RUFDZixNQUFNO0lBQUVDO0VBQUksQ0FBQyxHQUFHLE1BQU0sTUFBTSxDQUFDLHFCQUFxQixDQUFDO0VBQ25ELE1BQU07SUFBRUM7RUFBSyxDQUFDLEdBQUcsTUFBTSxNQUFNLENBQUMsbUJBQW1CLENBQUM7RUFDbEQsTUFBTUwsWUFBWSxDQUNoQkgsSUFBSSxFQUNKLENBQUMsR0FBRyxDQUFDLElBQUlDLFFBQVEsQ0FBQztBQUN0QixNQUFNLENBQUMsSUFBSSxDQUFDLElBQUlDLFNBQVMsQ0FBQztBQUMxQixJQUFJLEVBQUUsR0FBRyxDQUNQLENBQUM7QUFDSCIsImlnbm9yZUxpc3QiOltdfQ==

package/server/createDirectConnectSession.ts

@@ -0,0 +1,88 @@
+/* eslint-disable eslint-plugin-n/no-unsupported-features/node-builtins */
+
+import { errorMessage } from '../utils/errors.js'
+import { jsonStringify } from '../utils/slowOperations.js'
+import type { DirectConnectConfig } from './directConnectManager.js'
+import { connectResponseSchema } from './types.js'
+
+/**
+ * Errors thrown by createDirectConnectSession when the connection fails.
+ */
+export class DirectConnectError extends Error {
+  constructor(message: string) {
+    super(message)
+    this.name = 'DirectConnectError'
+  }
+}
+
+/**
+ * Create a session on a direct-connect server.
+ *
+ * Posts to `${serverUrl}/sessions`, validates the response, and returns
+ * a DirectConnectConfig ready for use by the REPL or headless runner.
+ *
+ * Throws DirectConnectError on network, HTTP, or response-parsing failures.
+ */
+export async function createDirectConnectSession({
+  serverUrl,
+  authToken,
+  cwd,
+  dangerouslySkipPermissions,
+}: {
+  serverUrl: string
+  authToken?: string
+  cwd: string
+  dangerouslySkipPermissions?: boolean
+}): Promise<{
+  config: DirectConnectConfig
+  workDir?: string
+}> {
+  const headers: Record<string, string> = {
+    'content-type': 'application/json',
+  }
+  if (authToken) {
+    headers['authorization'] = `Bearer ${authToken}`
+  }
+
+  let resp: Response
+  try {
+    resp = await fetch(`${serverUrl}/sessions`, {
+      method: 'POST',
+      headers,
+      body: jsonStringify({
+        cwd,
+        ...(dangerouslySkipPermissions && {
+          dangerously_skip_permissions: true,
+        }),
+      }),
+    })
+  } catch (err) {
+    throw new DirectConnectError(
+      `Failed to connect to server at ${serverUrl}: ${errorMessage(err)}`,
+    )
+  }
+
+  if (!resp.ok) {
+    throw new DirectConnectError(
+      `Failed to create session: ${resp.status} ${resp.statusText}`,
+    )
+  }
+
+  const result = connectResponseSchema().safeParse(await resp.json())
+  if (!result.success) {
+    throw new DirectConnectError(
+      `Invalid session response: ${result.error.message}`,
+    )
+  }
+
+  const data = result.data
+  return {
+    config: {
+      serverUrl,
+      sessionId: data.session_id,
+      wsUrl: data.ws_url,
+      authToken,
+    },
+    workDir: data.work_dir,
+  }
+}