@choochmeque/tauri-apple-extensions 0.1.0 → 0.1.2

package/README.md

@@ -8,9 +8,9 @@ Add iOS extensions to Tauri apps with a single command.
 ## Features
 
 - Automatic Xcode project configuration via XcodeGen
-- Plugin-based template system
+- Built-in skeleton templates with TODO markers
+- Plugin-based template system for custom implementations
 - Idempotent - safe to re-run
-- Share Extension support (more extension types coming soon)
 
 ## Prerequisites
 
@@ -20,34 +20,57 @@ Add iOS extensions to Tauri apps with a single command.
 ## Installation
 
 ```bash
+# npm
 npm install -D @choochmeque/tauri-apple-extensions
-```
 
-## Usage
+# pnpm
+pnpm add -D @choochmeque/tauri-apple-extensions
+
+# yarn
+yarn add -D @choochmeque/tauri-apple-extensions
 
-### With a plugin (recommended)
+# bun
+bun add -D @choochmeque/tauri-apple-extensions
+```
 
-If you're using a Tauri plugin that provides iOS extension templates:
+## Usage
 
 ```bash
-npx @choochmeque/tauri-apple-extensions add share --plugin @choochmeque/tauri-plugin-sharekit-api
+npx @choochmeque/tauri-apple-extensions add share
 ```
 
-### With custom templates
+This creates a Share Extension with a minimal skeleton template. Open the generated Swift file and implement your logic where you see `// TODO:` comments.
+
+### Options
 
 ```bash
+# Use templates from a plugin (plugin must include tauri-apple-extension config)
+npx @choochmeque/tauri-apple-extensions add share --plugin <plugin-name>
+
+# Use custom templates directory
 npx @choochmeque/tauri-apple-extensions add share --templates ./path/to/templates
 ```
 
+> **Note:** When using `--plugin`, the plugin's `package.json` must contain a `tauri-apple-extension` config. See [For Plugin Developers](#for-plugin-developers) below.
+
 ## Supported Extensions
 
-| Type | Status | Description |
-|------|--------|-------------|
-| `share` | Available | Share Extension for receiving shared content |
+| Type | Description |
+|------|-------------|
+| `share` | Share Extension for receiving shared content |
+
+## Post-Setup Steps
+
+After running the tool:
+
+1. Open the Xcode project (`src-tauri/gen/apple/*.xcodeproj`)
+2. Select your Apple Developer Team for both targets
+3. Enable **App Groups** capability for both targets
+4. Configure App Groups in [Apple Developer Portal](https://developer.apple.com/account/resources/identifiers/list/applicationGroup)
 
 ## For Plugin Developers
 
-To make your plugin compatible with this tool, add the following to your `package.json`:
+To make your plugin compatible, add to your `package.json`:
 
 ```json
 {
@@ -58,10 +81,6 @@ To make your plugin compatible with this tool, add the following to your `packag
 }
 ```
 
-Your templates directory should contain:
-- Swift source files with `{{VARIABLE}}` placeholders
-- `Info.plist` for the extension
-
 ### Template Variables
 
 | Variable | Description |
@@ -72,19 +91,10 @@ Your templates directory should contain:
 | `{{BUNDLE_IDENTIFIER}}` | Extension bundle identifier |
 | `{{PRODUCT_NAME}}` | App product name |
 
-## Post-Setup Steps
-
-After running the tool:
-
-1. Open the Xcode project (`src-tauri/gen/apple/*.xcodeproj`)
-2. Select your Apple Developer Team for both targets
-3. Enable required capabilities (e.g., App Groups) for both targets
-4. Configure the capability in Apple Developer Portal
-
 ## Contributing
 
-PRs accepted. Please make sure to read the Contributing Guide before making a pull request.
+PRs welcome! Please open an issue first to discuss what you would like to change.
 
 ## License
 
-MIT
+[MIT](LICENSE)

package/dist/cli.js

@@ -118,6 +118,25 @@ function addExtensionTarget(projectYml, targetConfig) {
     }
     return modified;
 }
+function addUrlSchemeToTarget(projectYml, targetName, urlScheme, bundleIdentifier) {
+    let modified = projectYml;
+    // Check if URL scheme already exists
+    if (modified.includes(`CFBundleURLSchemes`) && modified.includes(urlScheme)) {
+        return modified;
+    }
+    // Find the target's info section and add URL scheme
+    const targetRegex = new RegExp(`(${targetName}:[\\s\\S]*?info:[\\s\\S]*?properties:)([\\s\\S]*?)(\\n    \\w|\\n  \\w|$)`, "m");
+    const match = modified.match(targetRegex);
+    if (match) {
+        const urlSchemeYaml = `
+        CFBundleURLTypes:
+          - CFBundleURLName: ${bundleIdentifier}
+            CFBundleURLSchemes:
+              - ${urlScheme}`;
+        modified = modified.replace(targetRegex, `$1$2${urlSchemeYaml}$3`);
+    }
+    return modified;
+}
 function addDependencyToTarget(projectYml, mainTargetName, dependencyConfig) {
     let modified = projectYml;
     // Remove existing dependency if it exists
@@ -189,41 +208,6 @@ function createExtensionEntitlements(extensionDir, appGroupId) {
     return entitlementsPath;
 }
 
-function addUrlSchemeToInfoPlist(appleDir, appInfo) {
-    const targetName = `${appInfo.productName}_iOS`;
-    const infoPlistPath = path.join(appleDir, targetName, "Info.plist");
-    const urlScheme = appInfo.productName.toLowerCase().replace(/[^a-z0-9]/g, "");
-    if (!fs.existsSync(infoPlistPath)) {
-        console.log(`Info.plist not found at ${infoPlistPath}, skipping URL scheme setup`);
-        return;
-    }
-    let infoPlist = fs.readFileSync(infoPlistPath, "utf8");
-    // Check if URL schemes already configured
-    if (infoPlist.includes("CFBundleURLSchemes")) {
-        if (!infoPlist.includes(urlScheme)) {
-            console.log(`URL scheme may need manual configuration. Add '${urlScheme}' to CFBundleURLSchemes.`);
-        }
-        return;
-    }
-    // Add URL scheme - need to insert before closing </dict></plist>
-    const urlSchemeEntry = `    <key>CFBundleURLTypes</key>
-    <array>
-        <dict>
-            <key>CFBundleURLSchemes</key>
-            <array>
-                <string>${urlScheme}</string>
-            </array>
-            <key>CFBundleURLName</key>
-            <string>${appInfo.identifier}</string>
-        </dict>
-    </array>
-`;
-    // Insert before the last </dict>
-    infoPlist = infoPlist.replace(/(\s*)<\/dict>\s*<\/plist>/, `\n${urlSchemeEntry}$1</dict>\n</plist>`);
-    fs.writeFileSync(infoPlistPath, infoPlist);
-    console.log(`Added URL scheme '${urlScheme}' to Info.plist`);
-}
-
 function runXcodeGen(appleDir) {
     try {
         console.log("Running xcodegen to regenerate project...");
@@ -405,6 +389,11 @@ const shareExtension = {
         modified = addDependencyToTarget(modified, targetName, {
             target: extensionName,
         });
+        // Add URL scheme to main app for deep linking from extension
+        const urlScheme = appInfo.productName
+            .toLowerCase()
+            .replace(/[^a-z0-9]/g, "");
+        modified = addUrlSchemeToTarget(modified, targetName, urlScheme, appInfo.identifier);
         return modified;
     },
 };
@@ -440,8 +429,8 @@ function resolveTemplatesDir(options, extensionType) {
         }
         return templatesPath;
     }
-    // Option 3: Default templates
-    const defaultTemplates = path.join(__dirname$1, "../../templates", extensionType);
+    // Option 3: Default templates (from bundled dist/cli.js -> ../templates)
+    const defaultTemplates = path.join(__dirname$1, "../templates", extensionType);
     if (!fs.existsSync(defaultTemplates)) {
         throw new Error(`No templates found. Use --plugin or --templates to specify templates.`);
     }
@@ -496,13 +485,11 @@ async function addExtension(type, options) {
         extension.createFiles(appleDir, appInfo, templatesDir);
         console.log(`\n2. Updating main app entitlements...`);
         updateMainAppEntitlements(appleDir, appInfo);
-        console.log(`\n3. Adding URL scheme to Info.plist...`);
-        addUrlSchemeToInfoPlist(appleDir, appInfo);
-        console.log(`\n4. Updating project.yml...`);
+        console.log(`\n3. Updating project.yml (extension target + URL scheme)...`);
         projectYml = readProjectYml(appleDir);
         projectYml = extension.updateProjectYml(projectYml, appInfo);
         writeProjectYml(appleDir, projectYml);
-        console.log(`\n5. Regenerating Xcode project...`);
+        console.log(`\n4. Regenerating Xcode project...`);
         runXcodeGen(appleDir);
         console.log(`\n========================================`);
         console.log(`${extension.displayName} setup complete!`);
@@ -526,7 +513,7 @@ const program = new Command();
 program
     .name("tauri-apple-extensions")
     .description("Add iOS extensions to Tauri apps")
-    .version("0.1.0");
+    .version("0.1.2");
 program
     .command("add <type>")
     .description("Add an extension (e.g., share)")

package/dist/core/project-yml.d.ts

@@ -2,4 +2,5 @@ import type { TargetConfig, DependencyConfig } from "../types.js";
 export declare function readProjectYml(appleDir: string): string;
 export declare function writeProjectYml(appleDir: string, content: string): void;
 export declare function addExtensionTarget(projectYml: string, targetConfig: TargetConfig): string;
+export declare function addUrlSchemeToTarget(projectYml: string, targetName: string, urlScheme: string, bundleIdentifier: string): string;
 export declare function addDependencyToTarget(projectYml: string, mainTargetName: string, dependencyConfig: DependencyConfig): string;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { addExtension } from "./commands/add.js";
 export { findProjectRoot, findTauriConfig, findAppleProjectDir, getAppInfo, } from "./core/project-discovery.js";
-export { readProjectYml, writeProjectYml } from "./core/project-yml.js";
+export { readProjectYml, writeProjectYml, addUrlSchemeToTarget, } from "./core/project-yml.js";
 export { updateMainAppEntitlements, createExtensionEntitlements, } from "./core/entitlements.js";
 export { addUrlSchemeToInfoPlist } from "./core/info-plist.js";
 export { runXcodeGen } from "./core/xcodegen.js";

package/dist/index.js

@@ -116,6 +116,25 @@ function addExtensionTarget(projectYml, targetConfig) {
     }
     return modified;
 }
+function addUrlSchemeToTarget(projectYml, targetName, urlScheme, bundleIdentifier) {
+    let modified = projectYml;
+    // Check if URL scheme already exists
+    if (modified.includes(`CFBundleURLSchemes`) && modified.includes(urlScheme)) {
+        return modified;
+    }
+    // Find the target's info section and add URL scheme
+    const targetRegex = new RegExp(`(${targetName}:[\\s\\S]*?info:[\\s\\S]*?properties:)([\\s\\S]*?)(\\n    \\w|\\n  \\w|$)`, "m");
+    const match = modified.match(targetRegex);
+    if (match) {
+        const urlSchemeYaml = `
+        CFBundleURLTypes:
+          - CFBundleURLName: ${bundleIdentifier}
+            CFBundleURLSchemes:
+              - ${urlScheme}`;
+        modified = modified.replace(targetRegex, `$1$2${urlSchemeYaml}$3`);
+    }
+    return modified;
+}
 function addDependencyToTarget(projectYml, mainTargetName, dependencyConfig) {
     let modified = projectYml;
     // Remove existing dependency if it exists
@@ -187,41 +206,6 @@ function createExtensionEntitlements(extensionDir, appGroupId) {
     return entitlementsPath;
 }
 
-function addUrlSchemeToInfoPlist(appleDir, appInfo) {
-    const targetName = `${appInfo.productName}_iOS`;
-    const infoPlistPath = path.join(appleDir, targetName, "Info.plist");
-    const urlScheme = appInfo.productName.toLowerCase().replace(/[^a-z0-9]/g, "");
-    if (!fs.existsSync(infoPlistPath)) {
-        console.log(`Info.plist not found at ${infoPlistPath}, skipping URL scheme setup`);
-        return;
-    }
-    let infoPlist = fs.readFileSync(infoPlistPath, "utf8");
-    // Check if URL schemes already configured
-    if (infoPlist.includes("CFBundleURLSchemes")) {
-        if (!infoPlist.includes(urlScheme)) {
-            console.log(`URL scheme may need manual configuration. Add '${urlScheme}' to CFBundleURLSchemes.`);
-        }
-        return;
-    }
-    // Add URL scheme - need to insert before closing </dict></plist>
-    const urlSchemeEntry = `    <key>CFBundleURLTypes</key>
-    <array>
-        <dict>
-            <key>CFBundleURLSchemes</key>
-            <array>
-                <string>${urlScheme}</string>
-            </array>
-            <key>CFBundleURLName</key>
-            <string>${appInfo.identifier}</string>
-        </dict>
-    </array>
-`;
-    // Insert before the last </dict>
-    infoPlist = infoPlist.replace(/(\s*)<\/dict>\s*<\/plist>/, `\n${urlSchemeEntry}$1</dict>\n</plist>`);
-    fs.writeFileSync(infoPlistPath, infoPlist);
-    console.log(`Added URL scheme '${urlScheme}' to Info.plist`);
-}
-
 function runXcodeGen(appleDir) {
     try {
         console.log("Running xcodegen to regenerate project...");
@@ -403,6 +387,11 @@ const shareExtension = {
         modified = addDependencyToTarget(modified, targetName, {
             target: extensionName,
         });
+        // Add URL scheme to main app for deep linking from extension
+        const urlScheme = appInfo.productName
+            .toLowerCase()
+            .replace(/[^a-z0-9]/g, "");
+        modified = addUrlSchemeToTarget(modified, targetName, urlScheme, appInfo.identifier);
         return modified;
     },
 };
@@ -438,8 +427,8 @@ function resolveTemplatesDir(options, extensionType) {
         }
         return templatesPath;
     }
-    // Option 3: Default templates
-    const defaultTemplates = path.join(__dirname$1, "../../templates", extensionType);
+    // Option 3: Default templates (from bundled dist/cli.js -> ../templates)
+    const defaultTemplates = path.join(__dirname$1, "../templates", extensionType);
     if (!fs.existsSync(defaultTemplates)) {
         throw new Error(`No templates found. Use --plugin or --templates to specify templates.`);
     }
@@ -494,13 +483,11 @@ async function addExtension(type, options) {
         extension.createFiles(appleDir, appInfo, templatesDir);
         console.log(`\n2. Updating main app entitlements...`);
         updateMainAppEntitlements(appleDir, appInfo);
-        console.log(`\n3. Adding URL scheme to Info.plist...`);
-        addUrlSchemeToInfoPlist(appleDir, appInfo);
-        console.log(`\n4. Updating project.yml...`);
+        console.log(`\n3. Updating project.yml (extension target + URL scheme)...`);
         projectYml = readProjectYml(appleDir);
         projectYml = extension.updateProjectYml(projectYml, appInfo);
         writeProjectYml(appleDir, projectYml);
-        console.log(`\n5. Regenerating Xcode project...`);
+        console.log(`\n4. Regenerating Xcode project...`);
         runXcodeGen(appleDir);
         console.log(`\n========================================`);
         console.log(`${extension.displayName} setup complete!`);
@@ -520,4 +507,39 @@ async function addExtension(type, options) {
     }
 }
 
-export { addExtension, addUrlSchemeToInfoPlist, createExtensionEntitlements, findAppleProjectDir, findProjectRoot, findTauriConfig, getAppInfo, readProjectYml, runXcodeGen, shareExtension, updateMainAppEntitlements, writeProjectYml };
+function addUrlSchemeToInfoPlist(appleDir, appInfo) {
+    const targetName = `${appInfo.productName}_iOS`;
+    const infoPlistPath = path.join(appleDir, targetName, "Info.plist");
+    const urlScheme = appInfo.productName.toLowerCase().replace(/[^a-z0-9]/g, "");
+    if (!fs.existsSync(infoPlistPath)) {
+        console.log(`Info.plist not found at ${infoPlistPath}, skipping URL scheme setup`);
+        return;
+    }
+    let infoPlist = fs.readFileSync(infoPlistPath, "utf8");
+    // Check if URL schemes already configured
+    if (infoPlist.includes("CFBundleURLSchemes")) {
+        if (!infoPlist.includes(urlScheme)) {
+            console.log(`URL scheme may need manual configuration. Add '${urlScheme}' to CFBundleURLSchemes.`);
+        }
+        return;
+    }
+    // Add URL scheme - need to insert before closing </dict></plist>
+    const urlSchemeEntry = `    <key>CFBundleURLTypes</key>
+    <array>
+        <dict>
+            <key>CFBundleURLSchemes</key>
+            <array>
+                <string>${urlScheme}</string>
+            </array>
+            <key>CFBundleURLName</key>
+            <string>${appInfo.identifier}</string>
+        </dict>
+    </array>
+`;
+    // Insert before the last </dict>
+    infoPlist = infoPlist.replace(/(\s*)<\/dict>\s*<\/plist>/, `\n${urlSchemeEntry}$1</dict>\n</plist>`);
+    fs.writeFileSync(infoPlistPath, infoPlist);
+    console.log(`Added URL scheme '${urlScheme}' to Info.plist`);
+}
+
+export { addExtension, addUrlSchemeToInfoPlist, addUrlSchemeToTarget, createExtensionEntitlements, findAppleProjectDir, findProjectRoot, findTauriConfig, getAppInfo, readProjectYml, runXcodeGen, shareExtension, updateMainAppEntitlements, writeProjectYml };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@choochmeque/tauri-apple-extensions",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Add iOS extensions to Tauri apps with a single command",
   "type": "module",
   "main": "./dist/index.js",
@@ -12,16 +12,6 @@
     "templates",
     "README.md"
   ],
-  "scripts": {
-    "build": "rollup -c",
-    "prepublishOnly": "pnpm build",
-    "pretest": "pnpm build",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "lint": "eslint .",
-    "format": "prettier --write \"./**/*.{cjs,mjs,js,jsx,mts,ts,tsx,html,css,json}\"",
-    "format:check": "prettier --check \"./**/*.{cjs,mjs,js,jsx,mts,ts,tsx,html,css,json}\""
-  },
   "keywords": [
     "tauri",
     "ios",
@@ -45,7 +35,6 @@
     "commander": "^14.0.2"
   },
   "devDependencies": {
-    "@eslint/js": "^9.39.2",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
     "@types/node": "^25.0.3",
@@ -60,5 +49,13 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "packageManager": "pnpm@10.16.0+sha512.8066e7b034217b700a9a4dbb3a005061d641ba130a89915213a10b3ca4919c19c037bec8066afdc559b89635fdb806b16ea673f2468fbb28aabfa13c53e3f769"
-}
+  "scripts": {
+    "build": "rollup -c",
+    "pretest": "pnpm build",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "lint": "eslint .",
+    "format": "prettier --write \"./**/*.{cjs,mjs,js,jsx,mts,ts,tsx,html,css,json}\"",
+    "format:check": "prettier --check \"./**/*.{cjs,mjs,js,jsx,mts,ts,tsx,html,css,json}\""
+  }
+}

package/templates/share/ShareViewController.swift

@@ -1,246 +1,126 @@
 import UIKit
 import Social
-import MobileCoreServices
 import UniformTypeIdentifiers
 
 class ShareViewController: UIViewController {
 
-    // MARK: - Configuration (will be replaced by setup script)
+    // MARK: - Configuration
     private let appGroupIdentifier = "{{APP_GROUP_IDENTIFIER}}"
     private let appURLScheme = "{{APP_URL_SCHEME}}"
 
+    // MARK: - Lifecycle
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        view.backgroundColor = .clear
+        // TODO: Setup your UI here
     }
 
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        handleSharedContent()
+        processSharedItems()
     }
 
-    private func handleSharedContent() {
-        // Check App Groups configuration early
-        if FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupIdentifier) == nil {
-            showError("App Groups not configured.\n\nPlease enable 'App Groups' capability in Xcode for both the main app and ShareExtension targets, and configure '\(appGroupIdentifier)' in Apple Developer Portal.")
-            return
-        }
+    // MARK: - Share Processing
 
+    private func processSharedItems() {
         guard let extensionItems = extensionContext?.inputItems as? [NSExtensionItem] else {
-            completeRequest()
+            complete()
             return
         }
 
-        // Use a serial queue to safely collect results
-        let resultQueue = DispatchQueue(label: "sharekit.results")
-        var sharedContent: [String: Any] = [:]
-        var files: [[String: Any]] = []
-        var textContent: String? = nil
-
-        let group = DispatchGroup()
-
-        for extensionItem in extensionItems {
-            guard let attachments = extensionItem.attachments else { continue }
+        for item in extensionItems {
+            guard let attachments = item.attachments else { continue }
 
             for attachment in attachments {
-                group.enter()
-
-                if attachment.hasItemConformingToTypeIdentifier(UTType.image.identifier) {
-                    // Check image FIRST (before URL) because images can also be URLs
-                    attachment.loadItem(forTypeIdentifier: UTType.image.identifier, options: nil) { [weak self] item, error in
-                        defer { group.leave() }
+                // TODO: Handle different content types
+                // Examples:
+                //   - UTType.image.identifier for images
+                //   - UTType.url.identifier for URLs
+                //   - UTType.text.identifier for text
+                //   - UTType.fileURL.identifier for files
+
+                if attachment.hasItemConformingToTypeIdentifier(UTType.url.identifier) {
+                    attachment.loadItem(forTypeIdentifier: UTType.url.identifier) { [weak self] item, error in
                         if let url = item as? URL {
-                            if let fileInfo = self?.copyFileToAppGroup(url: url) {
-                                resultQueue.sync { files.append(fileInfo) }
-                            }
-                        } else if let image = item as? UIImage {
-                            if let fileInfo = self?.saveImageToAppGroup(image: image) {
-                                resultQueue.sync { files.append(fileInfo) }
-                            }
+                            // TODO: Process the URL
+                            print("Received URL: \(url)")
                         }
-                    }
-                } else if attachment.hasItemConformingToTypeIdentifier(UTType.url.identifier) {
-                    attachment.loadItem(forTypeIdentifier: UTType.url.identifier, options: nil) { [weak self] item, error in
-                        defer { group.leave() }
-                        guard let url = item as? URL else { return }
-
-                        if url.isFileURL {
-                            if let fileInfo = self?.copyFileToAppGroup(url: url) {
-                                resultQueue.sync { files.append(fileInfo) }
-                            }
-                        } else {
-                            resultQueue.sync { textContent = url.absoluteString }
+                        DispatchQueue.main.async {
+                            self?.complete()
                         }
                     }
-                } else if attachment.hasItemConformingToTypeIdentifier(UTType.text.identifier) {
-                    attachment.loadItem(forTypeIdentifier: UTType.text.identifier, options: nil) { item, error in
-                        defer { group.leave() }
+                    return
+                }
+
+                if attachment.hasItemConformingToTypeIdentifier(UTType.text.identifier) {
+                    attachment.loadItem(forTypeIdentifier: UTType.text.identifier) { [weak self] item, error in
                         if let text = item as? String {
-                            resultQueue.sync { textContent = text }
+                            // TODO: Process the text
+                            print("Received text: \(text)")
+                        }
+                        DispatchQueue.main.async {
+                            self?.complete()
                         }
                     }
-                } else if attachment.hasItemConformingToTypeIdentifier(UTType.data.identifier) {
-                    attachment.loadItem(forTypeIdentifier: UTType.data.identifier, options: nil) { [weak self] item, error in
-                        defer { group.leave() }
+                    return
+                }
+
+                if attachment.hasItemConformingToTypeIdentifier(UTType.image.identifier) {
+                    attachment.loadItem(forTypeIdentifier: UTType.image.identifier) { [weak self] item, error in
                         if let url = item as? URL {
-                            if let fileInfo = self?.copyFileToAppGroup(url: url) {
-                                resultQueue.sync { files.append(fileInfo) }
-                            }
+                            // TODO: Process image file URL
+                            print("Received image: \(url)")
+                        } else if let image = item as? UIImage {
+                            // TODO: Process UIImage directly
+                            print("Received UIImage")
+                        }
+                        DispatchQueue.main.async {
+                            self?.complete()
                         }
                     }
-                } else {
-                    group.leave()
+                    return
                 }
             }
         }
 
-        group.notify(queue: .main) { [weak self] in
-            guard let self = self else { return }
-
-            if !files.isEmpty {
-                sharedContent["type"] = "files"
-                sharedContent["files"] = files
-            } else if let text = textContent {
-                sharedContent["type"] = "text"
-                sharedContent["text"] = text
-            }
-
-            if !sharedContent.isEmpty {
-                _ = self.saveToAppGroup(content: sharedContent)
-                self.openMainAppAndComplete()
-            } else {
-                self.completeRequest()
-            }
-        }
-    }
-
-    private func showError(_ message: String) {
-        let alert = UIAlertController(
-            title: "ShareKit Error",
-            message: message,
-            preferredStyle: .alert
-        )
-        alert.addAction(UIAlertAction(title: "OK", style: .default) { [weak self] _ in
-            self?.completeRequest()
-        })
-        present(alert, animated: true)
-    }
-
-    private func copyFileToAppGroup(url: URL) -> [String: Any]? {
-        guard let containerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupIdentifier) else {
-            return nil
-        }
-
-        let sharedFilesDir = containerURL.appendingPathComponent("shared_files", isDirectory: true)
-        try? FileManager.default.createDirectory(at: sharedFilesDir, withIntermediateDirectories: true)
-
-        let fileName = url.lastPathComponent
-        let destinationURL = sharedFilesDir.appendingPathComponent(UUID().uuidString + "_" + fileName)
-
-        do {
-            if url.startAccessingSecurityScopedResource() {
-                defer { url.stopAccessingSecurityScopedResource() }
-                try FileManager.default.copyItem(at: url, to: destinationURL)
-            } else {
-                try FileManager.default.copyItem(at: url, to: destinationURL)
-            }
-
-            var fileInfo: [String: Any] = [
-                "path": destinationURL.path,
-                "name": fileName
-            ]
-
-            if let mimeType = getMimeType(for: url) {
-                fileInfo["mimeType"] = mimeType
-            }
-
-            if let attributes = try? FileManager.default.attributesOfItem(atPath: destinationURL.path),
-               let size = attributes[.size] as? Int64 {
-                fileInfo["size"] = size
-            }
-
-            return fileInfo
-        } catch {
-            print("ShareKit: Failed to copy file: \(error)")
-            return nil
-        }
-    }
-
-    private func saveImageToAppGroup(image: UIImage) -> [String: Any]? {
-        guard let containerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupIdentifier) else {
-            return nil
-        }
-
-        let sharedFilesDir = containerURL.appendingPathComponent("shared_files", isDirectory: true)
-        try? FileManager.default.createDirectory(at: sharedFilesDir, withIntermediateDirectories: true)
-
-        let fileName = UUID().uuidString + ".png"
-        let destinationURL = sharedFilesDir.appendingPathComponent(fileName)
-
-        guard let data = image.pngData() else { return nil }
-
-        do {
-            try data.write(to: destinationURL)
-
-            return [
-                "path": destinationURL.path,
-                "name": fileName,
-                "mimeType": "image/png",
-                "size": data.count
-            ]
-        } catch {
-            print("ShareKit: Failed to save image: \(error)")
-            return nil
-        }
+        complete()
     }
 
-    private func getMimeType(for url: URL) -> String? {
-        if let uti = UTType(filenameExtension: url.pathExtension) {
-            return uti.preferredMIMEType
-        }
-        return nil
-    }
+    // MARK: - App Group Storage (Optional)
 
-    private func saveToAppGroup(content: [String: Any]) -> Bool {
+    /// Save data to App Group for main app to read
+    private func saveToAppGroup(_ data: Data, forKey key: String) -> Bool {
         guard let userDefaults = UserDefaults(suiteName: appGroupIdentifier) else {
-            showError("App Groups not configured.\n\nPlease enable 'App Groups' capability in Xcode for both the main app and ShareExtension targets, and configure '\(appGroupIdentifier)' in Apple Developer Portal.")
+            print("App Groups not configured")
             return false
         }
+        userDefaults.set(data, forKey: key)
+        return true
+    }
 
-        do {
-            let data = try JSONSerialization.data(withJSONObject: content)
-            userDefaults.set(data, forKey: "pendingSharedContent")
-            userDefaults.synchronize()
-            return true
-        } catch {
-            showError("Failed to save shared content: \(error.localizedDescription)")
-            return false
-        }
+    /// Get App Group container URL for file storage
+    private func appGroupContainerURL() -> URL? {
+        FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupIdentifier)
     }
 
-    private func openMainAppAndComplete() {
-        guard let url = URL(string: "\(appURLScheme)://sharekit-content") else {
-            completeRequest()
-            return
-        }
+    // MARK: - Open Main App (Optional)
+
+    private func openMainApp() {
+        guard let url = URL(string: "\(appURLScheme)://share") else { return }
 
         var responder: UIResponder? = self
-        while responder != nil {
-            if let application = responder as? UIApplication {
-                if #available(iOS 18.0, *) {
-                    application.open(url, options: [:], completionHandler: nil)
-                } else {
-                    _ = application.perform(NSSelectorFromString("openURL:"), with: url)
-                }
+        while let r = responder {
+            if let application = r as? UIApplication {
+                application.open(url, options: [:], completionHandler: nil)
                 break
             }
-            responder = responder?.next
+            responder = r.next
         }
-
-        completeRequest()
     }
 
-    private func completeRequest() {
+    // MARK: - Complete
+
+    private func complete() {
         extensionContext?.completeRequest(returningItems: [], completionHandler: nil)
     }
 }