fix: resolve alias default send signatures

When the owning mailbox signature usage list omits a send_as alias, probe the alias mailbox before concluding there is no default signature. The selector still requires EmailAddress to match the final sender, and explicit/no-signature behavior is unchanged.

sprint: S1

Author: oOvalm

shortcuts/mail/mail_send.go

@@ -66,6 +66,12 @@ var MailSend = common.Shortcut{
 				Desc("Resolve explicit signature or default send signature.")
 			api = api.GET(mailboxPath(mailboxID, "settings", "send_as")).
 				Desc("Conditionally resolve sender identity for signature template variables.")
+			if aliasMailboxID := mailSendSignatureAliasMailboxID(mailboxID, runtime.Str("from")); aliasMailboxID != "" {
+				api = api.GET(mailboxPath(aliasMailboxID, "settings", "signatures")).
+					Desc("Fallback: resolve default send signature for the alias sender when the owning mailbox usage is absent.")
+				api = api.GET(mailboxPath(aliasMailboxID, "settings", "send_as")).
+					Desc("Fallback: resolve alias sender identity for signature template variables.")
+			}
 		}
 		api = api.
 			POST(mailboxPath(mailboxID, "drafts")).

shortcuts/mail/mail_send_signature.go

@@ -51,23 +51,62 @@ func resolveMailSendComposeSignature(ctx context.Context, runtime *common.Runtim
 		return resolveSignature(ctx, runtime, mailboxID, signatureID, senderEmail)
 	}
 
+	signatureMailboxID, defaultID, err := selectMailSendDefaultSignature(runtime, mailboxID, senderEmail)
+	if err != nil {
+		return nil, err
+	}
+	if mailSendSignatureIDIsEmpty(defaultID) {
+		return nil, nil
+	}
+	return resolveSignature(ctx, runtime, signatureMailboxID, defaultID, senderEmail)
+}
+
+func selectMailSendDefaultSignature(runtime *common.RuntimeContext, mailboxID, senderEmail string) (string, string, error) {
 	resp, err := signature.ListAll(runtime, mailboxID)
 	if err != nil {
-		return nil, mailAppendProblemHint(
+		return "", "", mailAppendProblemHint(
 			mailDecorateProblemMessage(err, "failed to look up default send signature"),
 			"pass --no-signature to send without a signature",
 		)
 	}
 
 	defaultID := selectMailSendDefaultSignatureID(resp.Usages, senderEmail)
 	if mailSendSignatureIDIsEmpty(defaultID) {
-		return nil, nil
+		return selectMailSendAliasDefaultSignature(runtime, mailboxID, senderEmail)
 	}
 	if !mailSendSignatureExists(resp.Signatures, defaultID) {
-		return nil, mailValidationError("default send signature %q was configured for %q but was not returned by settings/signatures", defaultID, mailSendSignatureSenderLabel(senderEmail)).
+		return "", "", mailValidationError("default send signature %q was configured for %q but was not returned by settings/signatures", defaultID, mailSendSignatureSenderLabel(senderEmail)).
 			WithHint("run `lark-cli mail +signature` to inspect signatures, or pass --no-signature to send without a signature")
 	}
-	return resolveSignature(ctx, runtime, mailboxID, defaultID, senderEmail)
+	return mailboxID, defaultID, nil
+}
+
+func selectMailSendAliasDefaultSignature(runtime *common.RuntimeContext, mailboxID, senderEmail string) (string, string, error) {
+	aliasMailboxID := mailSendSignatureAliasMailboxID(mailboxID, senderEmail)
+	if aliasMailboxID == "" {
+		return "", "", nil
+	}
+	resp, err := signature.ListAll(runtime, aliasMailboxID)
+	if err != nil {
+		return "", "", nil
+	}
+	defaultID := selectMailSendDefaultSignatureID(resp.Usages, senderEmail)
+	if mailSendSignatureIDIsEmpty(defaultID) {
+		return "", "", nil
+	}
+	if !mailSendSignatureExists(resp.Signatures, defaultID) {
+		return "", "", mailValidationError("default send signature %q was configured for %q but was not returned by settings/signatures", defaultID, mailSendSignatureSenderLabel(senderEmail)).
+			WithHint("run `lark-cli mail +signature` to inspect signatures, or pass --no-signature to send without a signature")
+	}
+	return aliasMailboxID, defaultID, nil
+}
+
+func mailSendSignatureAliasMailboxID(mailboxID, senderEmail string) string {
+	senderEmail = strings.TrimSpace(senderEmail)
+	if senderEmail == "" || strings.EqualFold(strings.TrimSpace(mailboxID), senderEmail) {
+		return ""
+	}
+	return senderEmail
 }
 
 func selectMailSendDefaultSignatureID(usages []signature.SignatureUsage, senderEmail string) string {

shortcuts/mail/mail_send_signature_test.go

@@ -5,6 +5,7 @@ package mail
 
 import (
 	"errors"
+	"net/url"
 	"strings"
 	"testing"
 
@@ -114,6 +115,96 @@ func TestMailSendDefaultSignatureUsesAliasSender(t *testing.T) {
 	}
 }
 
+func TestMailSendDefaultSignatureFallsBackToAliasMailbox(t *testing.T) {
+	f, stdout, _, reg := mailShortcutTestFactory(t)
+	ownerMailbox := "ttt@13.wybanjia.work"
+	aliasEmail := "unsubscribe_test@13.wybanjia.work"
+	reg.Register(&httpmock.Stub{
+		Method: "GET",
+		URL:    mailSendSignatureMockPath(ownerMailbox, "settings", "signatures"),
+		Body: map[string]interface{}{
+			"code": 0,
+			"data": map[string]interface{}{
+				"signatures": []interface{}{
+					map[string]interface{}{
+						"id":               "sig_owner",
+						"name":             "Owner",
+						"signature_type":   string(signature.SignatureTypeUser),
+						"signature_device": string(signature.DevicePC),
+						"content":          `<p>Owner Signature</p>`,
+					},
+				},
+				"usages": []interface{}{
+					map[string]interface{}{
+						"email_address":          ownerMailbox,
+						"send_mail_signature_id": "sig_owner",
+						"reply_signature_id":     "0",
+					},
+				},
+			},
+		},
+	})
+	reg.Register(&httpmock.Stub{
+		Method: "GET",
+		URL:    mailSendSignatureMockPath(aliasEmail, "settings", "signatures"),
+		Body: map[string]interface{}{
+			"code": 0,
+			"data": map[string]interface{}{
+				"signatures": []interface{}{
+					map[string]interface{}{
+						"id":                 "sig_alias",
+						"name":               "Alias",
+						"signature_type":     string(signature.SignatureTypeTenant),
+						"signature_device":   string(signature.DevicePC),
+						"content":            `<p>Alias sender <span data-variable-meta-props='{"id":"B-ENTERPRISE-EMAIL","type":"text"}'>placeholder</span></p>`,
+						"template_json_keys": []interface{}{"B-ENTERPRISE-EMAIL"},
+					},
+				},
+				"usages": []interface{}{
+					map[string]interface{}{
+						"email_address":          aliasEmail,
+						"send_mail_signature_id": "sig_alias",
+						"reply_signature_id":     "0",
+					},
+				},
+			},
+		},
+	})
+	reg.Register(&httpmock.Stub{
+		Method: "GET",
+		URL:    mailSendSignatureMockPath(aliasEmail, "settings", "send_as"),
+		Body: map[string]interface{}{
+			"code": 0,
+			"data": map[string]interface{}{
+				"sendable_addresses": []interface{}{
+					map[string]interface{}{"name": "Alias", "email_address": aliasEmail},
+				},
+			},
+		},
+	})
+	createStub := registerMailSendDraftCreate(reg, ownerMailbox)
+
+	err := runMountedMailShortcut(t, MailSend, []string{
+		"+send",
+		"--mailbox", ownerMailbox,
+		"--from", aliasEmail,
+		"--to", ownerMailbox,
+		"--subject", "hello",
+		"--body", "<p>alias body</p>",
+	}, f, stdout)
+	if err != nil {
+		t.Fatalf("send failed: %v", err)
+	}
+
+	raw := decodeCapturedRawEML(t, createStub.CapturedBody)
+	if !strings.Contains(raw, "Alias sender") || !strings.Contains(raw, aliasEmail) {
+		t.Fatalf("expected alias signature with alias send_as interpolation in EML:\n%s", raw)
+	}
+	if strings.Contains(raw, "Owner Signature") {
+		t.Fatalf("owner default signature should not be used for alias sender:\n%s", raw)
+	}
+}
+
 func TestMailSendExplicitSignatureOverridesDefault(t *testing.T) {
 	f, stdout, _, reg := mailShortcutTestFactory(t)
 	createStub := registerMailSendSignatureScenario(t, reg, mailSendSignatureScenario{
@@ -412,7 +503,7 @@ func registerMailSendSignatureScenario(t *testing.T, reg *httpmock.Registry, sce
 	}
 	reg.Register(&httpmock.Stub{
 		Method: "GET",
-		URL:    "/user_mailboxes/" + scenario.MailboxID + "/settings/signatures",
+		URL:    mailSendSignatureMockPath(scenario.MailboxID, "settings", "signatures"),
 		Body: map[string]interface{}{
 			"code": 0,
 			"data": map[string]interface{}{
@@ -436,7 +527,7 @@ func registerMailSendSignatureSendAs(reg *httpmock.Registry, mailboxID, defaultE
 	}
 	reg.Register(&httpmock.Stub{
 		Method: "GET",
-		URL:    "/user_mailboxes/" + mailboxID + "/settings/send_as",
+		URL:    mailSendSignatureMockPath(mailboxID, "settings", "send_as"),
 		Body: map[string]interface{}{
 			"code": 0,
 			"data": map[string]interface{}{
@@ -449,7 +540,7 @@ func registerMailSendSignatureSendAs(reg *httpmock.Registry, mailboxID, defaultE
 func registerMailSendDraftCreate(reg *httpmock.Registry, mailboxID string) *httpmock.Stub {
 	stub := &httpmock.Stub{
 		Method: "POST",
-		URL:    "/user_mailboxes/" + mailboxID + "/drafts",
+		URL:    mailSendSignatureMockPath(mailboxID, "drafts"),
 		Body: map[string]interface{}{
 			"code": 0,
 			"data": map[string]interface{}{
@@ -460,3 +551,11 @@ func registerMailSendDraftCreate(reg *httpmock.Registry, mailboxID string) *http
 	reg.Register(stub)
 	return stub
 }
+
+func mailSendSignatureMockPath(mailboxID string, segments ...string) string {
+	parts := []string{"/user_mailboxes/" + url.PathEscape(mailboxID)}
+	for _, segment := range segments {
+		parts = append(parts, url.PathEscape(segment))
+	}
+	return strings.Join(parts, "/")
+}