Stabilize debug terminal packaging and install diagnostics

Keep Android resource post-processing compatible with the current Cordova Android output while preserving the existing Android 14 build path.

Remove the allow-any-origin flag from the bundled terminal startup script for the current runtime validation build.

Add detailed bundled AXS copy failure logging so LAN debug output shows the exact asset-copy error instead of a generic fallback message.

Author: 埃博拉酱

hooks/post-process.js

@@ -21,19 +21,61 @@ if (
 if (fs.existsSync(androidGradleFilePath)) fs.unlinkSync(androidGradleFilePath);
 fs.copyFileSync(gradleFilePath, androidGradleFilePath);
 
-deleteDirRecursively(resPath, [
-  path.join('values', 'strings.xml'),
-  path.join('values', 'colors.xml'),
-  path.join('values', 'styles.xml'),
-  'anim',
-  'xml',
-]);
-copyDirRecursively(localResPath, resPath);
+const preservedRes = collectPreservedAndroidRes(resPath);
+deleteDirRecursively(resPath, preservedRes);
+
+const localResSkip = collectLocalResourceSkipList(resPath);
+
+copyDirRecursively(localResPath, resPath, localResSkip);
 enableLegacyJni();
 enableStaticContext();
 patchTargetSdkVersion();
 
 
+function collectPreservedAndroidRes(androidResPath) {
+  const preserved = [
+    path.join('values', 'styles.xml'),
+    'anim',
+    'xml',
+  ];
+
+  const optionalEntries = [
+    path.join('values', 'strings.xml'),
+    path.join('values', 'colors.xml'),
+    path.join('values', 'themes.xml'),
+    path.join('values', 'cdv_strings.xml'),
+    path.join('values', 'cdv_colors.xml'),
+    path.join('values', 'cdv_themes.xml'),
+    'values-night',
+    'values-night-v34',
+    'values-v34',
+  ];
+
+  for (const entry of optionalEntries) {
+    if (fs.existsSync(path.join(androidResPath, entry))) {
+      preserved.push(entry);
+    }
+  }
+
+  return preserved;
+}
+
+function collectLocalResourceSkipList(androidResPath) {
+  const skip = [];
+
+  // Cordova Android 15+ provides splash/theme defaults in cdv_* resources.
+  // Keep using local colors/themes on older layouts where those files do not exist.
+  if (fs.existsSync(path.join(androidResPath, 'values', 'cdv_colors.xml'))) {
+    skip.push(path.join('values', 'colors.xml'));
+  }
+  if (fs.existsSync(path.join(androidResPath, 'values', 'cdv_themes.xml'))) {
+    skip.push(path.join('values', 'themes.xml'));
+  }
+
+  return skip;
+}
+
+
 function getTmpDir() {
   const tmpdirEnv = process.env.TMPDIR;
 

package-lock.json

@@ -278,7 +278,7 @@ chmod +x "$PREFIX/alpine/initrc"
 # to happen inside axs itself, where the HTTP request is handled. Until axs gains
 # per-origin CORS or an equivalent auth gate, keep this stopgap so terminal
 # startup and localhost readiness probes remain functional.
-"$PREFIX/axs" --allow-any-origin -c "bash --rcfile /initrc -i"
+"$PREFIX/axs" -c "bash --rcfile /initrc -i"
 
 else
     exec "$@"

src/plugins/terminal/scripts/init-alpine.sh

@@ -1,5 +1,18 @@
 const Executor = require("./Executor");
 
+function formatAxsAssetError(error) {
+    if (!error) return "unknown error";
+    if (typeof error === "string") return error;
+    if (error instanceof Error) {
+        return error.stack || error.message || String(error);
+    }
+    try {
+        return JSON.stringify(error);
+    } catch (_) {
+        return String(error);
+    }
+}
+
 const Terminal = {
     /**
      * In debug builds, overwrite the axs binary from bundled assets to ensure
@@ -16,6 +29,7 @@ const Terminal = {
             });
             return true;
         } catch (e) {
+            console.warn("Failed to refresh bundled AXS from assets:", formatAxsAssetError(e));
             return false;
         }
     },
@@ -258,7 +272,7 @@ const Terminal = {
                             copiedFromAsset = true;
                             logger("✅  Bundled AXS copied from assets");
                         } catch (assetError) {
-                            logger("⚠️  Asset copy failed, will download instead");
+                            logger(`⚠️  Asset copy failed, will download instead: ${formatAxsAssetError(assetError)}`);
                         }
                     }