Merge pull request #106 from TrueNine/dev

dev

Author: TrueNine

Cargo.lock

@@ -9,7 +9,7 @@ members = [
 ]
 
 [workspace.package]
-version = "2026.10328.106"
+version = "2026.10329.110"
 edition = "2024"
 license = "AGPL-3.0-only"
 authors = ["TrueNine"]

Cargo.toml

@@ -1,6 +1,6 @@
 {
   "name": "@truenine/memory-sync-cli-darwin-arm64",
-  "version": "2026.10328.106",
+  "version": "2026.10329.110",
   "os": [
     "darwin"
   ],

cli/npm/darwin-arm64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truenine/memory-sync-cli-darwin-x64",
-  "version": "2026.10328.106",
+  "version": "2026.10329.110",
   "os": [
     "darwin"
   ],

cli/npm/darwin-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truenine/memory-sync-cli-linux-arm64-gnu",
-  "version": "2026.10328.106",
+  "version": "2026.10329.110",
   "os": [
     "linux"
   ],

cli/npm/linux-arm64-gnu/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truenine/memory-sync-cli-linux-x64-gnu",
-  "version": "2026.10328.106",
+  "version": "2026.10329.110",
   "os": [
     "linux"
   ],

cli/npm/linux-x64-gnu/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truenine/memory-sync-cli-win32-x64-msvc",
-  "version": "2026.10328.106",
+  "version": "2026.10329.110",
   "os": [
     "win32"
   ],

cli/npm/win32-x64-msvc/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@truenine/memory-sync-cli",
   "type": "module",
-  "version": "2026.10328.106",
+  "version": "2026.10329.110",
   "description": "TrueNine Memory Synchronization CLI",
   "author": "TrueNine",
   "license": "AGPL-3.0-only",
@@ -51,18 +51,23 @@
     "build": "run-s build:deps build:napi bundle finalize:bundle generate:schema",
     "build:napi": "tsx ../scripts/copy-napi.ts",
     "build:deps": "pnpm -F @truenine/logger -F @truenine/md-compiler -F @truenine/script-runtime run build",
+    "build:deps:ts": "pnpm -F @truenine/logger -F @truenine/md-compiler -F @truenine/script-runtime run build:ts",
     "bundle": "tsx ../scripts/build-quiet.ts",
-    "check": "run-p typecheck lint",
+    "check": "run-s build:deps:ts check:run",
+    "check:run": "run-p lint:run typecheck:run",
     "finalize:bundle": "tsx scripts/finalize-bundle.ts",
     "generate:schema": "tsx scripts/generate-schema.ts",
-    "lint": "eslint --cache --cache-location node_modules/.cache/.eslintcache .",
+    "lint": "run-s build:deps:ts lint:run",
+    "lint:run": "eslint --cache --cache-location node_modules/.cache/.eslintcache .",
     "prepublishOnly": "run-s build check",
     "test": "run-s build:deps test:run",
     "test:native-cleanup-smoke": "tsx scripts/cleanup-native-smoke.ts",
     "test:run": "vitest run",
     "benchmark:cleanup": "tsx scripts/benchmark-cleanup.ts",
-    "lintfix": "eslint --fix --cache --cache-location node_modules/.cache/.eslintcache .",
-    "typecheck": "tsc --noEmit -p tsconfig.lib.json"
+    "lintfix": "run-s build:deps:ts lintfix:run",
+    "lintfix:run": "eslint --fix --cache --cache-location node_modules/.cache/.eslintcache .",
+    "typecheck": "run-s build:deps:ts typecheck:run",
+    "typecheck:run": "tsc --noEmit -p tsconfig.lib.json"
   },
   "dependencies": {
     "json5": "catalog:",

cli/package.json

@@ -32,4 +32,36 @@ describe('configLoader', () => {
       fs.rmSync(tempHome, {recursive: true, force: true})
     }
   })
+
+  it('defaults aindex.softwares when loading an older config file', () => {
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'tnmsc-config-loader-'))
+    const configPath = path.join(tempDir, '.tnmsc.json')
+
+    try {
+      fs.writeFileSync(configPath, JSON.stringify({
+        workspaceDir: '/tmp/workspace',
+        aindex: {
+          dir: 'aindex',
+          skills: {src: 'skills', dist: 'dist/skills'},
+          commands: {src: 'commands', dist: 'dist/commands'},
+          subAgents: {src: 'subagents', dist: 'dist/subagents'},
+          rules: {src: 'rules', dist: 'dist/rules'},
+          globalPrompt: {src: 'global.src.mdx', dist: 'dist/global.mdx'},
+          workspacePrompt: {src: 'workspace.src.mdx', dist: 'dist/workspace.mdx'},
+          app: {src: 'app', dist: 'dist/app'},
+          ext: {src: 'ext', dist: 'dist/ext'},
+          arch: {src: 'arch', dist: 'dist/arch'}
+        }
+      }), 'utf8')
+
+      const loader = new ConfigLoader()
+      const result = loader.loadFromFile(configPath)
+
+      expect(result.found).toBe(true)
+      expect(result.config.aindex?.softwares).toEqual({src: 'softwares', dist: 'dist/softwares'})
+    }
+    finally {
+      fs.rmSync(tempDir, {recursive: true, force: true})
+    }
+  })
 })

cli/src/ConfigLoader.test.ts

@@ -1,24 +1,25 @@
+import type {ILogger} from '@truenine/logger'
 import type {
   AindexConfig,
   CleanupProtectionOptions,
   ConfigLoaderOptions,
   ConfigLoadResult,
   FrontMatterOptions,
-  ILogger,
   OutputScopeOptions,
   PluginOutputScopeTopics,
   UserConfigFile,
   WindowsOptions
 } from './plugins/plugin-core'
 import * as fs from 'node:fs'
 import process from 'node:process'
+import {createLogger} from '@truenine/logger'
 import {
   buildConfigDiagnostic,
   buildFileOperationDiagnostic,
   diagnosticLines,
   splitDiagnosticText
 } from './diagnostics'
-import {createLogger, ZUserConfigFile} from './plugins/plugin-core'
+import {mergeAindexConfig, ZUserConfigFile} from './plugins/plugin-core'
 import {
   getRequiredGlobalConfigPath,
   resolveRuntimeEnvironment,
@@ -189,18 +190,7 @@ export class ConfigLoader {
     if (a == null && b == null) return void 0
     if (a == null) return b
     if (b == null) return a
-    return {
-      dir: b.dir ?? a.dir,
-      skills: {...a.skills, ...b.skills},
-      commands: {...a.commands, ...b.commands},
-      subAgents: {...a.subAgents, ...b.subAgents},
-      rules: {...a.rules, ...b.rules},
-      globalPrompt: {...a.globalPrompt, ...b.globalPrompt},
-      workspacePrompt: {...a.workspacePrompt, ...b.workspacePrompt},
-      app: {...a.app, ...b.app},
-      ext: {...a.ext, ...b.ext},
-      arch: {...a.arch, ...b.arch}
-    }
+    return mergeAindexConfig(a, b)
   }
 
   private mergeOutputScopeTopics(